Merge from trunk.

11 files changed, 67 insertions, 37 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ceb3617176..95113007f27 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,38 @@
+2011-10-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-directory-p): Return t for
+        filenames "/method:foo:".
+
+2011-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * comint.el (comint-get-old-input-default): Fix use-prompt-regexp case
+        (bug#9865).
+
+2011-10-24  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.  (Bug#9819)
+
+2011-10-24  Michael Albinus  <michael.albinus@gmx.de>
+
+        * notifications.el: Add the requirement of a running D-Bus session
+        bus to the Commentary.
+
+2011-10-24  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
+        `search-whitespace-regexp' only when `isearch-regexp' is non-nil.
+        (Bug#9364)
+
+2011-10-24  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-following-node-name-re): Add newline to the list
+        of allowed characters for leading space.  (Bug#9824)
+
+2011-10-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding.
+        * progmodes/octave-mod.el (octave-help): Remove.
+
 2011-10-23  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.2.3.
@@ -16,16 +51,16 @@
         for toggle-read-only.  Note that this hasn't called vc-next-action
         since 2008-05-02, though it wasn't documented at the time.
 
-        * vc/ediff-init.el (ediff-toggle-read-only-function): Use
-        toggle-read-only.
+        * vc/ediff-init.el (ediff-toggle-read-only-function):
+        Use toggle-read-only.
 
 2011-10-22  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         Fix bug #9560, sporadic wrong indentation; improve instrumentation
         of c-parse-state.
 
-        * cc-engine.el (c-append-lower-brace-pair-to-state-cache): correct
-        faulty logical expression.
+        * cc-engine.el (c-append-lower-brace-pair-to-state-cache):
+        correct faulty logical expression.
         (c-parse-state-state, c-record-parse-state-state):
         (c-replay-parse-state-state): New defvar/defuns.
         (c-debug-parse-state): Use new functions.
@@ -39,8 +74,8 @@
 
         * progmodes/idlwave.el (idlwave-mode):
         * progmodes/vera-mode.el (vera-mode): No need to set
-        require-final-newline; that's done in prog-mode.  Suggested by
-        Stefan Monnier.
+        require-final-newline; that's done in prog-mode.
+        Suggested by Stefan Monnier.
 
 2011-10-21  Martin Rudalics  <rudalics@gmx.at>
 
@@ -61,8 +96,8 @@
 2011-10-21  Chong Yidong  <cyd@gnu.org>
 
         * progmodes/idlwave.el (idlwave-mode):
-        * progmodes/vera-mode.el (vera-mode): Use
-        mode-require-final-newline.
+        * progmodes/vera-mode.el (vera-mode):
+        Use mode-require-final-newline.
 
 2011-10-20  Glenn Morris  <rgm@gnu.org>
 
@@ -198,8 +233,8 @@
         (global-whitespace-mode, global-whitespace-newline-mode):
         * xt-mouse.el (xterm-mouse-mode): Doc fix.
 
-        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
-        autogenerated docstring.
+        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+        Fix autogenerated docstring.
 
 2011-10-19  Juri Linkov  <juri@jurta.org>
 
diff --git a/lisp/comint.el b/lisp/comint.el
index 591be5e2d9d..b91b82adb21 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2151,8 +2151,10 @@ current line, if point is on an output field.
 If `comint-use-prompt-regexp' is non-nil, then return
 the current line with any initial string matching the regexp
 `comint-prompt-regexp' removed."
-  (let ((bof (field-beginning)))
-    (if (null (get-char-property bof 'field)) ;Not `output'.
+  (let (bof)
+    (if (and (not comint-use-prompt-regexp)
+             ;; Make sure we're in an input rather than output field.
+             (null (get-char-property (setq bof (field-beginning)) 'field)))
         (field-string-no-properties bof)
       (comint-bol)
       (buffer-substring-no-properties (point) (line-end-position)))))
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index b1cb0615e43..4b6f4d634ca 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -94,8 +94,9 @@ Optional LIGHTER is displayed in the modeline when the mode is on.
 Optional KEYMAP is the default keymap bound to the mode keymap.
   If non-nil, it should be a variable name (whose value is a keymap),
   or an expression that returns either a keymap or a list of
-  arguments for `easy-mmode-define-keymap'.  If KEYMAP is not a symbol,
-  this also defines the variable MODE-map.
+  arguments for `easy-mmode-define-keymap'.  If you supply a KEYMAP
+  argument that is not a symbol, this macro defines the variable
+  MODE-map and gives it the value that KEYMAP specifies.
 
 BODY contains code to execute each time the mode is enabled or disabled.
   It is executed after toggling the mode, and before running MODE-hook.
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 54b17d58f33..4f9db02b5e1 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -645,6 +645,8 @@ a list of colors that the current display can handle."
                ;; text in menu entries) and `SystemWindowText' (the default
                ;; color w32 uses for the text in windows and dialogs) may
                ;; be the same display color and be adjacent in the list.
+               ;; These system colors all have names prefixed with "System",
+               ;; which is hardcoded in w32fns.c (SYSTEM_COLOR_PREFIX).
                ;; This makes them different to any other color.  Bug#9722
                (not (and (eq system-type 'windows-nt)
                          (string-match-p "^System" (car (car l))))))
diff --git a/lisp/info.el b/lisp/info.el
index 4ccbeba2a47..b8deb3c9c7f 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2015,7 +2015,7 @@ Submatch 1 is the complete node name.
 Submatch 2 if non-nil is the parenthesized file name part of the node name.
 Submatch 3 is the local part of the node name.
 End of submatch 0, 1, and 3 are the same, so you can safely concat."
-  (concat "[ \t]*"                      ;Skip leading space.
+  (concat "[ \t\n]*"                    ;Skip leading space.
           "\\(\\(([^)]+)\\)?"   ;Node name can start with a file name.
           "\\([" (or allowedchars "^,\t\n") "]*" ;Any number of allowed chars.
           "[" (or allowedchars "^,\t\n") " ]" ;The last char can't be a space.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6cfcce59672..6bb23916da3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1452,7 +1452,7 @@ string.  NLINES has the same meaning as in `occur'."
         ;; Set `search-upper-case' to nil to not call
         ;; `isearch-no-upper-case-p' in `occur-1'.
         (search-upper-case nil)
-        (search-spaces-regexp search-whitespace-regexp))
+        (search-spaces-regexp (if isearch-regexp search-whitespace-regexp)))
     (occur regexp nlines)))
 
 (declare-function hi-lock-read-face-name "hi-lock" ())
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 56424f79476..55732194bc8 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1594,17 +1594,14 @@ and gid of the corresponding user is taken.  Both parameters must be integers."
 
 (defun tramp-sh-handle-file-directory-p (filename)
   "Like `file-directory-p' for Tramp files."
-  ;; Care must be taken that this function returns `t' for symlinks
-  ;; pointing to directories.  Surely the most obvious implementation
-  ;; would be `test -d', but that returns false for such symlinks.
-  ;; CCC: Stefan Monnier says that `test -d' follows symlinks.  And
-  ;; I now think he's right.  So we could be using `test -d', couldn't
-  ;; we?
-  ;;
-  ;; Alternatives: `cd %s', `test -d %s'
   (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname "file-directory-p"
-      (tramp-run-test "-d" filename))))
+    ;; `file-directory-p' is used as predicate for filename completion.
+    ;; Sometimes, when a connection is not established yet, it is
+    ;; desirable to return t immediately for "/method:foo:".  It can
+    ;; be expected that this is always a directory.
+    (or (zerop (length localname))
+        (with-file-property v localname "file-directory-p"
+          (tramp-run-test "-d" filename)))))
 
 (defun tramp-sh-handle-file-writable-p (filename)
   "Like `file-writable-p' for Tramp files."
diff --git a/lisp/notifications.el b/lisp/notifications.el
index 42cd40df36b..a4e7fdd5425 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -30,6 +30,9 @@
 ;;
 ;;   (require 'notifications)
 
+;; For proper usage, Emacs must be started in an environment with an
+;; active D-Bus session bus.
+
 ;;; Code:
 (eval-when-compile
   (require 'cl))
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index cb64b2436c6..e9d890c3f26 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -68,7 +68,7 @@ mode, set this to (\"-q\" \"--traditional\")."
     (define-key map "\C-c\C-l" 'inferior-octave-dynamic-list-input-ring)
     (define-key map [menu-bar inout list-history]
       '("List Input History" . inferior-octave-dynamic-list-input-ring))
-    (define-key map "\C-c\C-h" 'octave-help)
+    (define-key map "\C-c\C-h" 'info-lookup-symbol)
     map)
   "Keymap used in Inferior Octave mode.")
 
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 183347cdeca..5e13b8533e7 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -655,14 +655,6 @@ including a reproducible test case and send the message."
 
   (easy-menu-add octave-mode-menu)
   (octave-initialize-completions))
-
-(defvar info-lookup-mode)
-
-(defun octave-help ()
-  "Get help on Octave symbols from the Octave info files.
-Look up symbol in the function, operator and variable indices of the info files."
-  (let ((info-lookup-mode 'octave-mode))
-    (call-interactively 'info-lookup-symbol)))
 
 ;;; Miscellaneous useful functions
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 05ac198dd13..c88cef0ba0f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -116,8 +116,6 @@ BODY should be a list of Lisp expressions.
   ;; depend on backquote.el.
   (list 'function (cons 'lambda cdr)))
 
-;; Partial application of functions (similar to "currying").
-;; This function is here rather than in subr.el because it uses CL.
 (defun apply-partially (fun &rest args)
   "Return a function that is a partial application of FUN to ARGS.
 ARGS is a list of the first N arguments to pass to FUN.