Merge pull request #259 from zevlg/master

Merge 0.7.15 into releases

Author: zevlg

.github/FUNDING.yml

@@ -9,4 +9,3 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 open_collective: telega
-custom: ['https://www.donationalerts.com/r/zevlg']

README.md

@@ -7,10 +7,7 @@ comprehensive documentation.
 
 **This project is developed on two primary branches. The 'releases' branch
 is kept in compatibility with TDLib major releases. The 'master' branch is
-for developmental purposes, and utilizes unstable features in TDLib.
-If you are using a Git checkout solely for runtime, use the 'releases' 
-branch.**
-
+for developmental purposes, and utilizes unstable features in TDLib.**
 
 ---
 
@@ -63,7 +60,7 @@ In some random order:
 - [x] Multiple accounts
 - [ ] Traffic control, see [telega#62](https://github.com/zevlg/telega.el/issues/62)
 - [x] [TranslationsPlatform](https://translations.telegram.org) support (PARTLY)
-- [x] Message scheduling, reminders [PARTLY]
+- [x] Message scheduling, Reminders
 - [ ] Cloud themes, see [TDLib#691](https://github.com/tdlib/td/issues/691)
 - [x] Telegram Folders (since TDLib 1.6.6)
 - [x] Disable/Enable message notification on receiver side
@@ -87,15 +84,15 @@ And much more.
 
 Root buffer screen:
 
-![screen15](https://zevlg.github.io/telega/screen-15.png)
+![screen15](https://zevlg.github.io/telega/telega-root-v0.7.9.png)
 
 Chat in [@emacs_en](https://t.me/emacs_en "emacs_en") group:
 
 ![screen11](https://zevlg.github.io/telega/screen-11.png)
 
-Attaching funny cat sticker:
+Dashboard with Emacs Stories and important chats:
 
-![screen12](https://zevlg.github.io/telega/screen-12.png)
+![dashboard](https://zevlg.github.io/telega/emacs-stories-dashboard.png)
 
 # Starting with telega.el
 

contrib/telega-mnz.el

@@ -374,15 +374,18 @@ Return edited code as string."
      (not (telega--tl-get msg :can_be_edited)))
     ))
 
-(defun telega-mnz-msg-edit (msg)
+(defun telega-mnz-msg-edit (msg &optional edit-as-is)
   "Command to edit message MSG in a telega-mnz aware way."
-  (interactive (list (telega-msg-at (point))))
+  (interactive (list (telega-msg-at (point)) current-prefix-arg))
 
   (if-let* ((mnz-cb (telega-mnz--msg-code-block-at msg))
-            (edit-p (or (when (eq telega-mnz-edit-code-block 'query)
-                          (y-or-n-p (format "Edit «%s» code block? "
-                                            (plist-get mnz-cb :mode))))
-                        telega-mnz-edit-code-block)))
+            (edit-p
+             (if (eq telega-mnz-edit-code-block 'query)
+                 (y-or-n-p (format "%s «%s» code block? (`n' to edit message)"
+                                   (if (plist-get msg :can_be_edited)
+                                       "Edit" "View")
+                                   (plist-get mnz-cb :mode)))
+               telega-mnz-edit-code-block)))
       (if-let* ((msg-fmt-text (telega--tl-get msg :content :text))
                 (new-code (telega-mnz--msg-code-block-edit msg mnz-cb))
                 (cb-ent (plist-get mnz-cb :ent))
@@ -401,7 +404,7 @@ Return edited code as string."
         (ding))
 
     ;; Default behaviour
-    (telega-msg-edit msg)))
+    (telega-msg-edit msg edit-as-is)))
 
 (defun telega-mnz--chatbuf-attach-internal (language code)
   "Attach CODE of LANGUAGE to the chatbuf input."