[Emacs-diffs] trunk r115987: Re-implement the feature of showing eldoc info after editing.

[Leo Liu]

------------------------------------------------------------
revno: 115987
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16346
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sun 2014-01-12 12:00:03 +0800
message:
  Re-implement the feature of showing eldoc info after editing.
  
  * emacs-lisp/eldoc.el (eldoc-post-insert-mode): Remove.
  (eldoc-edit-message-commands): New function.
  (eldoc-print-after-edit): New variable.
  (eldoc-pre-command-refresh-echo-area): Emit message only by
  eldoc-message-commands.
  (eldoc-mode): Restrict eldoc-message-commands to editing commands
  if eldoc-print-after-edit is set. 
  
  * progmodes/octave.el (octave-mode-menu): Adapt to change in
  eldoc.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/eldoc.el       eldoc.el-20091113204419-o5vbwnq5f7feedwu-952
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-11 23:59:49 +0000
+++ b/lisp/ChangeLog    2014-01-12 04:00:03 +0000
@@ -1,3 +1,17 @@
+2014-01-12  Leo Liu  <address@hidden>
+
+       Re-implement the feature of showing eldoc info after editing.
+       * emacs-lisp/eldoc.el (eldoc-post-insert-mode): Remove.
+       (eldoc-edit-message-commands): New function.
+       (eldoc-print-after-edit): New variable.
+       (eldoc-pre-command-refresh-echo-area): Emit message only by
+       eldoc-message-commands.
+       (eldoc-mode): Restrict eldoc-message-commands to editing commands
+       if eldoc-print-after-edit is set.  (Bug#16346)
+
+       * progmodes/octave.el (octave-mode-menu): Adapt to change in
+       eldoc.
+
 2014-01-11  Eric S. Raymond  <address@hidden>
 
        * version.el (emacs-repository-get-version): Enhancee so the

=== modified file 'lisp/emacs-lisp/eldoc.el'
--- a/lisp/emacs-lisp/eldoc.el  2014-01-06 23:34:05 +0000
+++ b/lisp/emacs-lisp/eldoc.el  2014-01-12 04:00:03 +0000
@@ -1,4 +1,4 @@
-;;; eldoc.el --- show function arglist or variable docstring in echo area
+;;; eldoc.el --- show function arglist or variable docstring in echo area  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
@@ -62,6 +62,12 @@
   :type 'number
   :group 'eldoc)
 
+(defcustom eldoc-print-after-edit nil
+  "If non-nil eldoc info is only shown when editing.
+Changing the value requires toggling `eldoc-mode'."
+  :type 'boolean
+  :group 'eldoc)
+
 ;;;###autoload
 (defcustom eldoc-minor-mode-string (purecopy " ElDoc")
   "String to display in mode line when ElDoc Mode is enabled; nil for none."
@@ -150,6 +156,16 @@
   "The function used by `eldoc-message' to display messages.
 It should receive the same arguments as `message'.")
 
+(defun eldoc-edit-message-commands ()
+  (let ((cmds (make-vector 31 0))
+       (re (regexp-opt '("delete" "insert" "edit" "electric" "newline"))))
+    (mapatoms (lambda (s)
+               (and (commandp s)
+                    (string-match-p re (symbol-name s))
+                    (intern (symbol-name s) cmds)))
+             obarray)
+    cmds))
+
 
 ;;;###autoload
 (define-minor-mode eldoc-mode
@@ -168,25 +184,13 @@
   (setq eldoc-last-message nil)
   (if eldoc-mode
       (progn
+       (when eldoc-print-after-edit
+         (setq-local eldoc-message-commands (eldoc-edit-message-commands)))
        (add-hook 'post-command-hook 'eldoc-schedule-timer nil t)
        (add-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t))
-   (remove-hook 'post-command-hook 'eldoc-schedule-timer)
-   (remove-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area)))
-
-;;;###autoload
-(define-minor-mode eldoc-post-insert-mode nil
-  :group 'eldoc :lighter (:eval (if eldoc-mode ""
-                                 (concat eldoc-minor-mode-string "|i")))
-  (setq eldoc-last-message nil)
-  (let ((prn-info (lambda ()
-                   (unless eldoc-mode
-                     (eldoc-print-current-symbol-info)))))
-    (if eldoc-post-insert-mode
-       (add-hook 'post-self-insert-hook prn-info nil t)
-      (remove-hook 'post-self-insert-hook prn-info t))))
-
-;; FIXME: This changes Emacs's behavior when the file is loaded!
-(add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-post-insert-mode)
+    (kill-local-variable 'eldoc-message-commands)
+    (remove-hook 'post-command-hook 'eldoc-schedule-timer t)
+    (remove-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t)))
 
 ;;;###autoload
 (defun turn-on-eldoc-mode ()
@@ -264,8 +268,10 @@
 ;; This doesn't seem to be required for Emacs 19.28 and earlier.
 (defun eldoc-pre-command-refresh-echo-area ()
   (and eldoc-last-message
-       (if (eldoc-display-message-no-interference-p)
-           (eldoc-message eldoc-last-message)
+       (if (and (eldoc-display-message-no-interference-p)
+               (symbolp this-command)
+               (intern-soft (symbol-name this-command) eldoc-message-commands))
+          (eldoc-message eldoc-last-message)
          (setq eldoc-last-message nil))))
 
 ;; Decide whether now is a good time to display a message.
@@ -283,9 +289,7 @@
 ;; Check various conditions about the current environment that might make
 ;; it undesirable to print eldoc messages right this instant.
 (defun eldoc-display-message-no-interference-p ()
-  (and eldoc-mode
-       (not executing-kbd-macro)
-       (not (and (boundp 'edebug-active) edebug-active))))
+  (not (or executing-kbd-macro (bound-and-true-p edebug-active))))
 
 
 ;;;###autoload
@@ -309,7 +313,7 @@
   ;; This is run from post-command-hook or some idle timer thing,
   ;; so we need to be careful that errors aren't ignored.
   (with-demoted-errors "eldoc error: %s"
-    (and (or (eldoc-display-message-p) eldoc-post-insert-mode)
+    (and (eldoc-display-message-p)
         (if eldoc-documentation-function
             (eldoc-message (funcall eldoc-documentation-function))
           (let* ((current-symbol (eldoc-current-symbol))

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2014-01-10 10:35:36 +0000
+++ b/lisp/progmodes/octave.el  2014-01-12 04:00:03 +0000
@@ -154,12 +154,8 @@
     ["Insert Function"              octave-insert-defun t]
     ["Update Function File Comment" octave-update-function-file-comment t]
     "---"
-    ["Function Syntax Hints" (call-interactively
-                              (if (fboundp 'eldoc-post-insert-mode)
-                                  'eldoc-post-insert-mode
-                                'eldoc-mode))
-     :style toggle :selected (or (bound-and-true-p eldoc-post-insert-mode)
-                                (bound-and-true-p eldoc-mode))
+    ["Function Syntax Hints" (eldoc-mode 'toggle)
+     :style toggle :selected (bound-and-true-p eldoc-mode)
      :help "Display function signatures after typing `SPC' or `('"]
     ["Delimiter Matching"           show-paren-mode
      :style toggle :selected show-paren-mode

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2014-01-09 01:59:19 +0000
+++ b/lisp/simple.el    2014-01-12 04:00:03 +0000
@@ -1387,6 +1387,7 @@
         (lambda ()
           (add-hook 'completion-at-point-functions
                     #'lisp-completion-at-point nil t)
+         (eldoc-mode 1)
           (run-hooks 'eval-expression-minibuffer-setup-hook))
       (read-from-minibuffer prompt initial-contents
                             read-expression-map t