Merge changes from emacs-23 branch

12 files changed, 132 insertions, 44 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00460741961..b2e5e98016e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,51 @@
+2011-01-31  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-cmds.el (c-forward-over-illiterals): Continue
+        parsing if we encounter a naked # (Bug#7595).
+        (c-beginning-of-statement): Avoid loop in locating the beginning
+        of a macro.
+
+2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (copy-directory): Fix arguments to recursive call.
+
+2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (copy-directory): If destination is an existing
+        directory, copy into a subdirectory there.
+
+2011-01-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list
+        files.
+
+2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image-dired.el (image-dired-mouse-display-image): No-op if no
+        file is found (Bug#7817).
+
+        * mouse.el (mouse-menu-non-singleton): Doc fix (Bug#7801).
+
+2011-01-31  Kenichi Handa  <handa@m17n.org>
+
+        * international/quail.el (quail-keyboard-layout-alist): Remove
+        superfluous SPC for "pc105-uk" (bug#7927).
+
+2011-01-31  Glenn Morris  <rgm@gnu.org>
+
+        * msb.el (msb-menu-bar-update-buffers): Update for changed
+        argument handling of menu-bar-select-frame.  (Bug#7902)
+
+2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/cc-engine.el (c-forward-<>-arglist-recur): Set a limit
+        to the recursion depth (Bug#7722).
+
+2011-01-31  Roy Liu  <carsomyr@gmail.com>  (tiny change)
+
+        * term/ns-win.el (ns-find-file): Expand ns-input-file with
+        command-line-default-directory (Bug#7872).
+
 2011-01-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/compile.el (compilation--flush-directory-cache):
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index c5bad3bd40f..d5bba20b1cd 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -115,7 +115,7 @@ See the documentation for `list-load-path-shadows' for further information."
           ;; FILE now contains the current file name, with no suffix.
           (unless (or (member file files-seen-this-dir)
                       ;; Ignore these files.
-                      (member file '("subdirs")))
+                      (member file '("subdirs" "leim-list")))
             ;; File has not been seen yet in this directory.
             ;; This test prevents us declaring that XXX.el shadows
             ;; XXX.elc (or vice-versa) when they are in the same directory.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 879dd228562..ee81bc48693 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-31  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
+
+        * erc-track.el (track): Don't reset erc-modified-channels-object
+        each time erc-track-mode is activated.
+
 2011-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * erc.el (erc-mode):
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index b15cdb023a6..de920eb9c33 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -648,7 +648,6 @@ module, otherwise the keybindings will not do anything useful."
            (add-hook 'erc-send-completed-hook 'erc-user-is-active)
            (add-hook 'erc-server-001-functions 'erc-user-is-active))
        (erc-track-add-to-mode-line erc-track-position-in-mode-line)
-       (setq erc-modified-channels-object (erc-modified-channels-object nil))
        (erc-update-mode-line)
        (if (featurep 'xemacs)
            (defadvice switch-to-buffer (after erc-update (&rest args) activate)
diff --git a/lisp/files.el b/lisp/files.el
index 7abf5361bb4..8b42eaaddb8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4855,22 +4855,35 @@ this happens by default."
       ;; Compute target name.
       (setq directory (directory-file-name (expand-file-name directory))
             newname   (directory-file-name (expand-file-name newname)))
-      (if (not (file-directory-p newname)) (make-directory newname parents))
+
+      (if (not (file-directory-p newname))
+          ;; If NEWNAME is not an existing directory, create it; that
+          ;; is where we will copy the files of DIRECTORY.
+          (make-directory newname parents)
+        ;; If NEWNAME is an existing directory, we will copy into
+        ;; NEWNAME/[DIRECTORY-BASENAME].
+        (setq newname (expand-file-name
+                       (file-name-nondirectory
+                        (directory-file-name directory))
+                       newname))
+        (and (file-exists-p newname)
+             (not (file-directory-p newname))
+             (error "Cannot overwrite non-directory %s with a directory"
+                    newname))
+        (make-directory newname t))
 
       ;; Copy recursively.
-      (mapc
-       (lambda (file)
-         (let ((target (expand-file-name
-                        (file-name-nondirectory file) newname))
-               (attrs (file-attributes file)))
-           (cond ((file-directory-p file)
-                  (copy-directory file target keep-time parents))
-                 ((stringp (car attrs)) ; Symbolic link
-                  (make-symbolic-link (car attrs) target t))
-                 (t
-                  (copy-file file target t keep-time)))))
-       ;; We do not want to copy "." and "..".
-       (directory-files directory 'full directory-files-no-dot-files-regexp))
+      (dolist (file
+               ;; We do not want to copy "." and "..".
+               (directory-files directory 'full
+                                directory-files-no-dot-files-regexp))
+        (if (file-directory-p file)
+            (copy-directory file newname keep-time parents)
+          (let ((target (expand-file-name (file-name-nondirectory file) newname))
+                (attrs (file-attributes file)))
+            (if (stringp (car attrs)) ; Symbolic link
+                (make-symbolic-link (car attrs) target t)
+              (copy-file file target t keep-time)))))
 
       ;; Set directory attributes.
       (set-file-modes newname (file-modes directory))
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 8c26b699568..8fa6963b3d7 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -2194,15 +2194,15 @@ matching tag will be marked in the dired buffer."
 Track this in associated dired buffer if `image-dired-track-movement' is
 non-nil."
   (interactive "e")
-  (let (file)
-    (mouse-set-point event)
-    (goto-char (posn-point (event-end event)))
-    (setq file (image-dired-original-file-name))
-    (if image-dired-track-movement
-        (image-dired-track-original-file))
-    (image-dired-create-display-image-buffer)
-    (display-buffer image-dired-display-image-buffer)
-    (image-dired-display-image file)))
+  (mouse-set-point event)
+  (goto-char (posn-point (event-end event)))
+  (let ((file (image-dired-original-file-name)))
+    (when file
+      (if image-dired-track-movement
+          (image-dired-track-original-file))
+      (image-dired-create-display-image-buffer)
+      (display-buffer image-dired-display-image-buffer)
+      (image-dired-display-image file))))
 
 (defun image-dired-mouse-select-thumbnail (event)
   "Use mouse EVENT to select thumbnail image.
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index c5842740dbf..2174beb19c9 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -662,7 +662,7 @@ This layout is almost the same as that of VT100,
                               ")
    '("pc105-uk" . "\
                               \
-`\2541!2\"3\2434$5%6^7&8*9(0)-_=+     \
+`\2541!2\"3\2434$5%6^7&8*9(0)-_=+    \
   qQwWeErRtTyYuUiIoOpP[{]}    \
   aAsSdDfFgGhHjJkKlL;:'@#~    \
 \\|zZxXcCvVbBnNmM,<.>/?        \
diff --git a/lisp/mouse.el b/lisp/mouse.el
index c572263f3ba..c0b86d45028 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -201,9 +201,9 @@ items `Turn Off' and `Help'."
     newmap))
 
 (defun mouse-menu-non-singleton (menubar)
-  "Given menu keymap,
-if it defines exactly one submenu, return just that submenu.
-Otherwise return the whole menu."
+  "Return menu keybar MENUBAR, or a lone submenu inside it.
+If MENUBAR defines exactly one submenu, return just that submenu.
+Otherwise, return MENUBAR."
   (if menubar
       (let (submap)
         (map-keymap
diff --git a/lisp/msb.el b/lisp/msb.el
index fb9de914abf..1f84ef78164 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -1114,7 +1114,8 @@ variable `msb-menu-cond'."
                      (list (frame-parameter frame 'name)
                            (frame-parameter frame 'name)
                            (cons nil nil))
-                     'menu-bar-select-frame))
+                     `(lambda ()
+                        (interactive) (menu-bar-select-frame ,frame))))
                   frames)))))
       (setcdr global-buffers-menu-map
               (if (and buffers-menu frames-menu)
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 327ebea40cc..ec913e05c7e 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -2440,13 +2440,15 @@ function does not require the declaration to contain a brace block."
           (goto-char last)
           (throw 'done '(nil . nil)))
 
-         ;; Stop if we encounter a preprocessor line.
-         ((and (not macro-end)
+         ;; Stop if we encounter a preprocessor line.  Continue if we
+         ;; hit a naked #
+         ((and c-opt-cpp-prefix
+               (not macro-end)
                (eq (char-after) ?#)
                (= (point) (c-point 'boi)))
-          (goto-char last)
-          ;(throw 'done (cons (eq (point) here) 'macro-boundary))) ; Changed 2003/3/26
-          (throw 'done '(t . macro-boundary)))
+          (if (= (point) here)          ; Not a macro, therefore naked #.
+              (forward-char)
+            (throw 'done '(t . macro-boundary))))
 
          ;; Stop after a ';', '}', or "};"
          ((looking-at ";\\|};?")
@@ -2560,14 +2562,21 @@ be more \"DWIM:ey\"."
                                     (c-backward-syntactic-ws))
                                   (or (bobp) (c-after-statement-terminator-p)))))))
                 ;; Are we about to move backwards into or out of a
-                ;; preprocessor command?  If so, locate it's beginning.
+                ;; preprocessor command?  If so, locate its beginning.
                 (when (eq (cdr res) 'macro-boundary)
-                  (save-excursion
-                    (beginning-of-line)
-                    (setq macro-fence
-                          (and (not (bobp))
-                               (progn (c-skip-ws-backward) (c-beginning-of-macro))
-                               (point)))))
+                  (setq macro-fence
+                        (save-excursion
+                          (if macro-fence
+                              (progn
+                                (end-of-line)
+                                (and (not (eobp))
+                                     (progn (c-skip-ws-forward)
+                                            (c-beginning-of-macro))
+                                     (progn (c-end-of-macro)
+                                            (point))))
+                            (and (not (eobp))
+                                 (c-beginning-of-macro)
+                                 (progn (c-end-of-macro) (point)))))))
                 ;; Are we about to move backwards into a literal?
                 (when (memq (cdr res) '(macro-boundary literal))
                   (setq range (c-ascertain-preceding-literal)))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 406ee1a91d9..f90d29bf009 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5371,6 +5371,8 @@ comment at the start of cc-engine.el for more info."
 ;; cc-mode requires cc-fonts.
 (declare-function c-fontify-recorded-types-and-refs "cc-fonts" ())
 
+(defvar c-forward-<>-arglist-recur-depth)
+
 (defun c-forward-<>-arglist (all-types)
   ;; The point is assumed to be at a "<".  Try to treat it as the open
   ;; paren of an angle bracket arglist and move forward to the
@@ -5396,7 +5398,8 @@ comment at the start of cc-engine.el for more info."
         ;; If `c-record-type-identifiers' is set then activate
         ;; recording of any found types that constitute an argument in
         ;; the arglist.
-        (c-record-found-types (if c-record-type-identifiers t)))
+        (c-record-found-types (if c-record-type-identifiers t))
+        (c-forward-<>-arglist-recur--depth 0))
     (if (catch 'angle-bracket-arglist-escape
           (setq c-record-found-types
                 (c-forward-<>-arglist-recur all-types)))
@@ -5413,6 +5416,14 @@ comment at the start of cc-engine.el for more info."
       nil)))
 
 (defun c-forward-<>-arglist-recur (all-types)
+
+  ;; Temporary workaround for Bug#7722.
+  (when (boundp 'c-forward-<>-arglist-recur--depth)
+    (if (> c-forward-<>-arglist-recur--depth 200)
+        (error "Max recursion depth reached in <> arglist")
+      (setq c-forward-<>-arglist-recur--depth
+            (1+ c-forward-<>-arglist-recur--depth))))
+
   ;; Recursive part of `c-forward-<>-arglist'.
   ;;
   ;; This function might do hidden buffer changes.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 6286b83258b..712929ecec0 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -487,7 +487,9 @@ unless the current buffer is a scratch buffer."
 (defun ns-find-file ()
   "Do a `find-file' with the `ns-input-file' as argument."
   (interactive)
-  (let* ((f (file-truename (pop ns-input-file)))
+  (let* ((f (file-truename
+             (expand-file-name (pop ns-input-file)
+                               command-line-default-directory)))
          (file (find-file-noselect f))
          (bufwin1 (get-buffer-window file 'visible))
          (bufwin2 (get-buffer-window "*scratch*" 'visibile)))