merge trunk

14 files changed, 149 insertions, 96 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5647c86053e..d113d60af83 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,45 @@
+2014-01-12  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * net/eww.el (eww-download-directory): Rename from
+        `eww-download-path' (Bug#16419).
+
+2014-01-12  Leo Liu  <sdl.web@gmail.com>
+
+        * dired-x.el (dired-mode-map): Fix last change.
+
+        * emacs-lisp/eldoc.el (eldoc-mode): Add hook locally.
+
+2014-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Spelling fixes.
+        * emacs-lisp/generic.el (generic--normalize-comments):
+        Rename from generic--normalise-comments.  All uses changed.
+        * play/bubbles.el (bubbles--neighborhood-score):
+        (bubbles--mark-direct-neighbors, bubbles--mark-neighborhood)
+        (bubbles--neighborhood-available)
+        (bubbles--update-neighborhood-score):
+        Rename from names with 'neighbourhood'.  All uses changed.
+
+2014-01-12  Leo Liu  <sdl.web@gmail.com>
+
+        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  <esr@thyrsus.com>
 
+        * version.el (emacs-repository-get-version): Enhance so the
+        function works correctly in either a Bazaar or Git repo. The
+        Bazaar case can be discarded  after the repo transition.
+
         * play/meese.el: It's 2014 and Ed Meese is justly forgotten. Goes
         with removal of the joke manpages from /etc.
 
@@ -243,7 +283,7 @@
 2014-01-06  Leo Liu  <sdl.web@gmail.com>
 
         * dired-x.el (dired-mode-map): Rebind dired-omit-mode to C-x M-o
-        to avoid shadowning global key.  (Bug#16354)
+        to avoid shadowing global key.  (Bug#16354)
 
 2014-01-06  Daniel Colascione  <dancol@dancol.org>
 
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index a1ee1fa2e07..947de7cd9f8 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -241,7 +241,7 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
 
 ;;; KEY BINDINGS.
 
-(define-key dired-mode-map "\C-c\M-o" 'dired-omit-mode)
+(define-key dired-mode-map "\C-x\M-o" 'dired-omit-mode)
 (define-key dired-mode-map "*O" 'dired-mark-omitted)
 (define-key dired-mode-map "\M-(" 'dired-mark-sexp)
 (define-key dired-mode-map "*(" 'dired-mark-sexp)
diff --git a/lisp/dired.el b/lisp/dired.el
index 571e0d25be1..a30f34bc43a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4353,7 +4353,7 @@ instead.
 
 ;;;***
 
-;;;### (autoloads nil "dired-x" "dired-x.el" "fe5dbf515419da3b9907f32e5d4311fa")
+;;;### (autoloads nil "dired-x" "dired-x.el" "291bc6e869bf72c900604c45d40f45ed")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 8bd9ebc1e63..fa1574b0a88 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -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 @@ If this variable is set to 0, no idle time is required."
   :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 @@ This is used to determine if `eldoc-idle-delay' is changed by the user.")
   "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 @@ expression point is on."
   (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)
+        (add-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area nil t))
+    (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 @@ Otherwise work like `message'."
 ;; 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 @@ Otherwise work like `message'."
 ;; 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 @@ Emacs Lisp mode) that support ElDoc.")
   ;; 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))
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 146219885da..02c30aad55f 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -224,7 +224,7 @@ Some generic modes are defined in `generic-x.el'."
 
 ;;; Comment Functionality
 
-(defun generic--normalise-comments (comment-list)
+(defun generic--normalize-comments (comment-list)
   (let ((normalized '()))
     (dolist (start comment-list)
       (let (end)
@@ -300,7 +300,7 @@ Some generic modes are defined in `generic-x.el'."
 (defun generic-mode-set-comments (comment-list)
   "Set up comment functionality for generic mode."
   (let ((st (make-syntax-table))
-        (comment-list (generic--normalise-comments comment-list)))
+        (comment-list (generic--normalize-comments comment-list)))
     (generic-set-comment-syntax st comment-list)
     (generic-set-comment-vars comment-list)
     (set-syntax-table st)))
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index a0115f8ea66..082c9235ff9 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -291,7 +291,7 @@ To test this function, evaluate:
                (or (mouse-movement-p event)
                    (eq (car-safe event) 'switch-frame)))
         ;; Scroll if see if we're on the edge.
-        ;; NEEDSWORK: should handle mouse-in-other window.
+        ;; FIXME: should handle mouse-in-other window.
         (cond
          ((not (eq start-window (posn-window end)))
           t) ; wait for return to original window
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 38726fd7dcc..4375a31bd36 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -50,8 +50,8 @@
   :group 'eww
   :type 'string)
 
-(defcustom eww-download-path "~/Downloads/"
-  "Path where files will downloaded."
+(defcustom eww-download-directory "~/Downloads/"
+  "Directory where files will downloaded."
   :version "24.4"
   :group 'eww
   :type 'string)
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 69ad4da60ca..d24dad28363 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -1223,7 +1223,7 @@ some heuristics to guess the result."
        ;; When `org-blank-before-new-entry' says so, it is 1.
        ((eq insert-blank-p t) 1)
        ;; `plain-list-item' is 'auto.  Count blank lines separating
-       ;; neighbours items in list.
+       ;; neighbors' items in list.
        (t (let ((next-p (org-list-get-next-item item struct prevs)))
             (cond
              ;; Is there a next item?
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index fcf6aab2069..0102523b5c7 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -5093,7 +5093,7 @@ Return the new string."
 ;;;; Topology
 ;;
 ;; Here are various functions to retrieve information about the
-;; neighbourhood of a given element or object.  Neighbours of interest
+;; neighborhood of a given element or object.  Neighbors of interest
 ;; are direct parent (`org-export-get-parent'), parent headline
 ;; (`org-export-get-parent-headline'), first element containing an
 ;; object, (`org-export-get-parent-element'), parent table
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 8294d6398fe..e7f5725a0f0 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -231,7 +231,7 @@ Available modes are `shift-default' and `shift-always'."
 (defvar bubbles--score 0
   "Current Bubbles score.")
 
-(defvar bubbles--neighbourhood-score 0
+(defvar bubbles--neighborhood-score 0
   "Score of active bubbles neighborhood.")
 
 (defvar bubbles--faces nil
@@ -925,7 +925,7 @@ static char * dot3d_xpm[] = {
   (buffer-disable-undo)
   (force-mode-line-update)
   (redisplay)
-  (add-hook 'post-command-hook 'bubbles--mark-neighbourhood t t))
+  (add-hook 'post-command-hook 'bubbles--mark-neighborhood t t))
 
 ;;;###autoload
 (defun bubbles ()
@@ -1087,7 +1087,7 @@ Set `bubbles--col-offset' and `bubbles--row-offset'."
         (char-after (point))
       nil)))
 
-(defun bubbles--mark-direct-neighbours (row col char)
+(defun bubbles--mark-direct-neighbors (row col char)
   "Mark direct neighbors of bubble at ROW COL with same CHAR."
   (save-excursion
     (let ((count 0))
@@ -1097,13 +1097,13 @@ Set `bubbles--col-offset' and `bubbles--row-offset'."
         (add-text-properties (point) (1+ (point))
                              '(active t face 'bubbles--highlight-face))
         (setq count (+ 1
-                       (bubbles--mark-direct-neighbours row (1+ col) char)
-                       (bubbles--mark-direct-neighbours row (1- col) char)
-                       (bubbles--mark-direct-neighbours (1+ row) col char)
-                       (bubbles--mark-direct-neighbours (1- row) col char))))
+                       (bubbles--mark-direct-neighbors row (1+ col) char)
+                       (bubbles--mark-direct-neighbors row (1- col) char)
+                       (bubbles--mark-direct-neighbors (1+ row) col char)
+                       (bubbles--mark-direct-neighbors (1- row) col char))))
       count)))
 
-(defun bubbles--mark-neighbourhood (&optional pos)
+(defun bubbles--mark-neighborhood (&optional pos)
   "Mark neighborhood of point.
 Use optional parameter POS instead of point if given."
   (when bubbles--playing
@@ -1117,17 +1117,17 @@ Use optional parameter POS instead of point if given."
                              '(face default active nil))
         (let ((count 0))
           (when (and row col (not (eq char (bubbles--empty-char))))
-            (setq count (bubbles--mark-direct-neighbours row col char))
+            (setq count (bubbles--mark-direct-neighbors row col char))
             (unless (> count 1)
               (add-text-properties (point-min) (point-max)
                                    '(face default active nil))
               (setq count 0)))
-          (bubbles--update-neighbourhood-score count))
+          (bubbles--update-neighborhood-score count))
         (put-text-property (point-min) (point-max) 'pointer 'arrow)
         (bubbles--update-faces-or-images)
         (sit-for 0)))))
 
-(defun bubbles--neighbourhood-available ()
+(defun bubbles--neighborhood-available ()
   "Return t if another valid neighborhood is available."
   (catch 'found
     (save-excursion
@@ -1153,20 +1153,20 @@ Use optional parameter POS instead of point if given."
 
 (defun bubbles--reset-score ()
   "Reset bubbles score."
-  (setq bubbles--neighbourhood-score 0
+  (setq bubbles--neighborhood-score 0
         bubbles--score 0)
   (bubbles--update-score))
 
 (defun bubbles--update-score ()
   "Calculate and display new bubbles score."
-  (setq bubbles--score (+ bubbles--score bubbles--neighbourhood-score))
+  (setq bubbles--score (+ bubbles--score bubbles--neighborhood-score))
   (bubbles--show-scores))
 
-(defun bubbles--update-neighbourhood-score (size)
+(defun bubbles--update-neighborhood-score (size)
   "Calculate and display score of active neighborhood from its SIZE."
   (if (> size 1)
-      (setq bubbles--neighbourhood-score (expt (- size 1) 2))
-    (setq bubbles--neighbourhood-score 0))
+      (setq bubbles--neighborhood-score (expt (- size 1) 2))
+    (setq bubbles--neighborhood-score 0))
   (bubbles--show-scores))
 
 (defun bubbles--show-scores ()
@@ -1177,7 +1177,7 @@ Use optional parameter POS instead of point if given."
     (let ((inhibit-read-only t)
           (pos (point)))
       (delete-region (point) (point-max))
-      (insert (format "Selected: %4d\n" bubbles--neighbourhood-score))
+      (insert (format "Selected: %4d\n" bubbles--neighborhood-score))
       (insert " ")
       (add-text-properties (1- (point)) (point)
                            (list 'intangible t 'display
@@ -1216,10 +1216,10 @@ Use optional parameter POS instead of point if given."
   "Remove active bubbles region."
   (interactive)
   (when (and bubbles--playing
-             (> bubbles--neighbourhood-score 0))
+             (> bubbles--neighborhood-score 0))
     (setq bubbles--save-data (list bubbles--score (buffer-string)))
     (let ((inhibit-read-only t))
-      ;; blank out current neighbourhood
+      ;; blank out current neighborhood
       (let ((row (bubbles--row (point)))
             (col (bubbles--col (point))))
         (goto-char (point-max))
@@ -1289,7 +1289,7 @@ Use optional parameter POS instead of point if given."
           (bubbles--update-faces-or-images)
           (sit-for 0)))
       (put-text-property (point-min) (point-max) 'removed nil)
-      (unless (bubbles--neighbourhood-available)
+      (unless (bubbles--neighborhood-available)
         (bubbles--game-over)))
     ;; undo
     (setq buffer-undo-list '((apply bubbles-undo . nil)))
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index e2ef492a9ad..1378e8fdb59 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -154,12 +154,8 @@ parenthetical grouping.")
     ["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
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 3ae9a21c3e4..daf8d299663 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -3504,7 +3504,7 @@ so that `occur-next' and `occur-prev' will work."
 
 ;; Originally this was sh-learn-region-indent (beg end)
 ;; However, in practice this was awkward so I changed it to
-;; use the whole buffer.  Use narrowing if needbe.
+;; use the whole buffer.  Use narrowing if need be.
 (defun sh-learn-buffer-indent (&optional arg)
   "Learn how to indent the buffer the way it currently is.
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 5c2f3c3db1d..ae18ae65fb5 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1387,6 +1387,7 @@ display the result of expression evaluation."
         (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
diff --git a/lisp/version.el b/lisp/version.el
index 71e56858afa..b2557142a78 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -145,40 +145,52 @@ maybe ask the VCS itself, if the sources appear to be under
 version control.  If `force', always ask.  the VCS. Otherwise
 only ask the VCS if we cannot find any information ourselves."
   (or dir (setq dir source-directory))
-  (when (file-directory-p (expand-file-name ".bzr/branch" dir))
-    (if (eq external 'force)
-        (emacs-bzr-version-bzr dir)
-      (let (file loc rev)
-        (cond ((file-readable-p
-                (setq file (expand-file-name ".bzr/branch/last-revision" dir)))
-               (with-temp-buffer
-                 (insert-file-contents file)
-                 (goto-char (point-max))
-                 (if (looking-back "\n")
-                     (delete-char -1))
-                 (buffer-string)))
-              ;; OK, no last-revision.  Is it a lightweight checkout?
-              ((file-readable-p
-                (setq file (expand-file-name ".bzr/branch/location" dir)))
-               (setq rev (emacs-bzr-version-dirstate dir))
-               ;; If the parent branch is local, try looking there for the rev.
-               ;; Note: there is no guarantee that the parent branch's rev
-               ;; corresponds to this branch.  This branch could have
-               ;; been made with a specific -r revno argument, or the
-               ;; parent could have been updated since this branch was created.
-               ;; To try and detect this, we check the dirstate revids
-               ;; to see if they match.
-               (if (and (setq loc (with-temp-buffer
-                                    (insert-file-contents file)
-                                    (if (looking-at "file://\\(.*\\)")
-                                        (match-string 1))))
-                        (equal rev (emacs-bzr-version-dirstate loc)))
-                   (emacs-bzr-get-version loc)
-                 ;; If parent does not match, the best we can do without
-                 ;; calling external commands is to use the dirstate rev.
-                 rev))
-              (external
-               (emacs-bzr-version-bzr dir)))))))
+  (or 
+   ;; Bazaar case -- to be removed after transition
+   (when (file-directory-p (expand-file-name ".bzr/branch" dir))
+     (if (eq external 'force)
+         (emacs-bzr-version-bzr dir)
+       (let (file loc rev)
+         (cond ((file-readable-p
+                 (setq file (expand-file-name ".bzr/branch/last-revision" dir)))
+                (with-temp-buffer
+                  (insert-file-contents file)
+                  (goto-char (point-max))
+                  (if (looking-back "\n")
+                      (delete-char -1))
+                  (buffer-string)))
+               ;; OK, no last-revision.  Is it a lightweight checkout?
+               ((file-readable-p
+                 (setq file (expand-file-name ".bzr/branch/location" dir)))
+                (setq rev (emacs-bzr-version-dirstate dir))
+                ;; If the parent branch is local, try looking there for the rev.
+                ;; Note: there is no guarantee that the parent branch's rev
+                ;; corresponds to this branch.  This branch could have
+                ;; been made with a specific -r revno argument, or the
+                ;; parent could have been updated since this branch was created.
+                ;; To try and detect this, we check the dirstate revids
+                ;; to see if they match.
+                (if (and (setq loc (with-temp-buffer
+                                     (insert-file-contents file)
+                                     (if (looking-at "file://\\(.*\\)")
+                                         (match-string 1))))
+                         (equal rev (emacs-bzr-version-dirstate loc)))
+                    (emacs-bzr-get-version loc)
+                  ;; If parent does not match, the best we can do without
+                  ;; calling external commands is to use the dirstate rev.
+                  rev))
+               (external
+                (emacs-bzr-version-bzr dir))))))
+   ;; Git case
+  (when (file-directory-p (expand-file-name ".git" dir))
+    (message "Waiting for git...")
+    (with-temp-buffer
+      (if (zerop
+           (call-process "git" nil '(t nil) nil "log"
+                         "-1"
+                         "--pretty=format:%N"))
+          (replace-regexp-in-string "\n" "" (buffer-string)))))
+   ))
 
 ;; We put version info into the executable in the form that `ident' uses.
 (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))