Merge from trunk

7 files changed, 110 insertions, 96 deletions

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 5ac30bc28ce..0f873e678c3 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -2564,19 +2564,12 @@ be more \"DWIM:ey\"."
                 ;; Are we about to move backwards into or out of a
                 ;; preprocessor command?  If so, locate its beginning.
                 (when (eq (cdr res) 'macro-boundary)
-                  (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)))))))
+                  (save-excursion
+                    (beginning-of-line)
+                    (setq macro-fence
+                          (and (not (bobp))
+                               (progn (c-skip-ws-backward) (c-beginning-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/compile.el b/lisp/progmodes/compile.el
index 88f418f934a..40383c6bc31 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -860,27 +860,29 @@ POS and RES.")
                        (car compilation--previous-directory-cache)))
            (prev
             (previous-single-property-change
-             pos 'compilation-directory nil cache)))
-      (cond
-       ((null cache)
-        (setq compilation--previous-directory-cache
-              (cons (copy-marker pos) (copy-marker prev)))
-        prev)
-       ((eq prev cache)
-        (if cache
-            (set-marker (car compilation--previous-directory-cache) pos)
-          (setq compilation--previous-directory-cache
-                (cons (copy-marker pos) nil)))
-        (cdr compilation--previous-directory-cache))
-       (t
-        (if cache
-            (progn
-              (set-marker (car compilation--previous-directory-cache) pos)
-              (setcdr compilation--previous-directory-cache
-                      (copy-marker prev)))
-          (setq compilation--previous-directory-cache
-                (cons (copy-marker pos) (copy-marker prev))))
-        prev)))))
+             pos 'compilation-directory nil cache))
+           (res
+            (cond
+             ((null cache)
+              (setq compilation--previous-directory-cache
+                    (cons (copy-marker pos) (if prev (copy-marker prev))))
+              prev)
+             ((and prev (= prev cache))
+              (if cache
+                  (set-marker (car compilation--previous-directory-cache) pos)
+                (setq compilation--previous-directory-cache
+                      (cons (copy-marker pos) nil)))
+              (cdr compilation--previous-directory-cache))
+             (t
+              (if cache
+                  (progn
+                    (set-marker cache pos)
+                    (setcdr compilation--previous-directory-cache
+                            (copy-marker prev)))
+                (setq compilation--previous-directory-cache
+                      (cons (copy-marker pos) (if prev (copy-marker prev)))))
+              prev))))
+      (if (markerp res) (marker-position res) res))))
 
 ;; Internal function for calculating the text properties of a directory
 ;; change message.  The compilation-directory property is important, because it
@@ -889,7 +891,7 @@ POS and RES.")
 (defun compilation-directory-properties (idx leave)
   (if leave (setq leave (match-end leave)))
   ;; find previous stack, and push onto it, or if `leave' pop it
-  (let ((dir (compilation--previous-directory (point))))
+  (let ((dir (compilation--previous-directory (match-beginning 0))))
     (setq dir (if dir (or (get-text-property (1- dir) 'compilation-directory)
                           (get-text-property dir 'compilation-directory))))
     `(font-lock-face ,(if leave
@@ -948,7 +950,8 @@ POS and RES.")
                             (match-string-no-properties file))))
           (let ((dir
             (unless (file-name-absolute-p file)
-                   (let ((pos (compilation--previous-directory (point))))
+                   (let ((pos (compilation--previous-directory
+                               (match-beginning 0))))
                      (when pos
                        (or (get-text-property (1- pos) 'compilation-directory)
                            (get-text-property pos 'compilation-directory)))))))
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index c376b25fae0..0f823c806e0 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -26,14 +26,14 @@
 
 ;; To enter Delphi mode when you find a Delphi source file, one must override
 ;; the auto-mode-alist to associate Delphi with .pas (and .dpr and .dpk)
-;; files. Emacs, by default, will otherwise enter Pascal mode. E.g.
+;; files.  Emacs, by default, will otherwise enter Pascal mode. E.g.
 ;;
 ;; (autoload 'delphi-mode "delphi")
 ;; (setq auto-mode-alist
 ;;       (cons '("\\.\\(pas\\|dpr\\|dpk\\)$" . delphi-mode) auto-mode-alist))
 
 ;; To get keyword, comment, and string literal coloring, be sure that font-lock
-;; is running. One can manually do M-x font-lock-mode in a Delphi buffer, or
+;; is running.  One can manually do M-x font-lock-mode in a Delphi buffer, or
 ;; one can put in .emacs:
 ;;
 ;; (add-hook 'delphi-mode-hook 'turn-on-font-lock)
@@ -56,8 +56,8 @@
 ;; When you have entered Delphi mode, you may get more info by pressing
 ;; C-h m.
 
-;; This delphi mode implementation is fairly tolerant of syntax errors, relying
-;; as much as possible on the indentation of the previous statement. This also
+;; This Delphi mode implementation is fairly tolerant of syntax errors, relying
+;; as much as possible on the indentation of the previous statement.  This also
 ;; makes it faster and simpler, since there is less searching for properly
 ;; constructed beginnings.
 
@@ -74,15 +74,16 @@
   "True if in debug mode.")
 
 (defcustom delphi-search-path "."
-  "*Directories to search when finding external units. It is a list of
-directory strings. If only a single directory, it can be a single
-string instead of a list. If a directory ends in \"...\" then that
-directory is recursively searched."
+  "*Directories to search when finding external units.
+It is a list of directory strings.  If only a single directory,
+it can be a single string instead of a list.  If a directory
+ends in \"...\" then that directory is recursively searched."
   :type 'string
   :group 'delphi)
 
 (defcustom delphi-indent-level 3
-  "*Indentation of Delphi statements with respect to containing block. E.g.
+  "*Indentation of Delphi statements with respect to containing block.
+E.g.
 
 begin
    // This is an indent of 3.
@@ -117,7 +118,7 @@ end;                            end;"
   :group 'delphi)
 
 (defcustom delphi-verbose t ; nil
-  "*If true then delphi token processing progress is reported to the user."
+  "*If true then Delphi token processing progress is reported to the user."
   :type 'boolean
   :group 'delphi)
 
@@ -137,17 +138,17 @@ differs from the default."
   :group 'delphi)
 
 (defcustom delphi-comment-face 'font-lock-comment-face
-  "*Face used to color delphi comments."
+  "*Face used to color Delphi comments."
   :type 'face
   :group 'delphi)
 
 (defcustom delphi-string-face 'font-lock-string-face
-  "*Face used to color delphi strings."
+  "*Face used to color Delphi strings."
   :type 'face
   :group 'delphi)
 
 (defcustom delphi-keyword-face 'font-lock-keyword-face
-  "*Face used to color delphi keywords."
+  "*Face used to color Delphi keywords."
   :type 'face
   :group 'delphi)
 
@@ -720,9 +721,9 @@ routine.")
       (delphi-progress-done)))))
 
 (defvar delphi-ignore-changes t
-  "Internal flag to control if the delphi-mode responds to buffer changes.
-Defaults to t in case the delphi-after-change function is called on a
-non-delphi buffer. Set to nil in a delphi buffer.  To override, just do:
+  "Internal flag to control if the Delphi mode responds to buffer changes.
+Defaults to t in case the `delphi-after-change' function is called on a
+non-Delphi buffer.  Set to nil in a Delphi buffer.  To override, just do:
  (let ((delphi-ignore-changes t)) ...)")
 
 (defun delphi-after-change (change-start change-end old-length)
@@ -1521,8 +1522,8 @@ non-delphi buffer. Set to nil in a delphi buffer.  To override, just do:
       indent)))
 
 (defun delphi-indent-line ()
-  "Indent the current line according to the current language construct. If
-before the indent, the point is moved to the indent."
+  "Indent the current line according to the current language construct.
+If before the indent, the point is moved to the indent."
   (interactive)
   (delphi-save-match-data
    (let ((marked-point (point-marker))  ; Maintain our position reliably.
@@ -1547,7 +1548,7 @@ before the indent, the point is moved to the indent."
      (set-marker marked-point nil))))
 
 (defvar delphi-mode-abbrev-table nil
-  "Abbrev table in use in delphi-mode buffers.")
+  "Abbrev table in use in Delphi mode buffers.")
 (define-abbrev-table 'delphi-mode-abbrev-table ())
 
 (defmacro delphi-ensure-buffer (buffer-var buffer-name)
@@ -1568,7 +1569,7 @@ before the indent, the point is moved to the indent."
 ;; Debugging helpers:
 
 (defvar delphi-debug-buffer nil
-  "Buffer to write delphi-mode debug messages to. Created on demand.")
+  "Buffer to write Delphi mode debug messages to.  Created on demand.")
 
 (defun delphi-debug-log (format-string &rest args)
   ;; Writes a message to the log buffer.
@@ -1679,7 +1680,7 @@ before the indent, the point is moved to the indent."
 
 (defun delphi-tab ()
   "Indent the region, when Transient Mark mode is enabled and the region is
-active. Otherwise, indent the current line or insert a TAB, depending on the
+active.  Otherwise, indent the current line or insert a TAB, depending on the
 value of `delphi-tab-always-indents' and the current line position."
   (interactive)
   (cond ((use-region-p)
@@ -1768,8 +1769,8 @@ value of `delphi-tab-always-indents' and the current line position."
     nil))
 
 (defun delphi-find-unit (unit)
-  "Finds the specified delphi source file according to `delphi-search-path'.
-If no extension is specified, .pas is assumed. Creates a buffer for the unit."
+  "Find the specified Delphi source file according to `delphi-search-path'.
+If no extension is specified, .pas is assumed.  Creates a buffer for the unit."
   (interactive "sDelphi unit name: ")
   (let* ((unit-file (if (string-match "^\\(.*\\)\\.[a-z]+$" unit)
                         unit
@@ -1791,7 +1792,7 @@ If no extension is specified, .pas is assumed. Creates a buffer for the unit."
   "Find the definition of the identifier under the current point, searching
 in external units if necessary (as listed in the current unit's use clause).
 The set of directories to search for a unit is specified by the global variable
-delphi-search-path."
+`delphi-search-path'."
   (interactive)
   (error "delphi-find-current-xdef: not implemented yet"))
 
@@ -1802,7 +1803,7 @@ it is a routine."
   (error "delphi-find-current-body: not implemented yet"))
 
 (defun delphi-fill-comment ()
-  "Fills the text of the current comment, according to `fill-column'.
+  "Fill the text of the current comment, according to `fill-column'.
 An error is raised if not in a comment."
   (interactive)
   (save-excursion
@@ -1888,8 +1889,8 @@ An error is raised if not in a comment."
             (delphi-progress-done)))))))
 
 (defun delphi-new-comment-line ()
-  "If in a // comment, does a newline, indented such that one is still in the
-comment block. If not in a // comment, just does a normal newline."
+  "If in a // comment, do a newline, indented such that one is still in the
+comment block.  If not in a // comment, just does a normal newline."
   (interactive)
   (let ((comment (delphi-current-token)))
     (if (not (eq 'comment-single-line (delphi-token-kind comment)))
@@ -1923,7 +1924,7 @@ comment block. If not in a // comment, just does a normal newline."
     nil ; Syntax begin movement doesn't apply
     (font-lock-fontify-region-function . delphi-fontify-region)
     (font-lock-verbose . delphi-fontifying-progress-step))
-  "Delphi mode font-lock defaults. Syntactic fontification is ignored.")
+  "Delphi mode font-lock defaults.  Syntactic fontification is ignored.")
 
 (defvar delphi-debug-mode-map
   (let ((kmap (make-sparse-keymap)))
@@ -1944,7 +1945,7 @@ comment block. If not in a // comment, just does a normal newline."
             ("x" delphi-debug-show-is-stable)
             ))
     kmap)
-  "Keystrokes for delphi-mode debug commands.")
+  "Keystrokes for Delphi mode debug commands.")
 
 (defvar delphi-mode-map
   (let ((kmap (make-sparse-keymap)))
@@ -1964,7 +1965,7 @@ comment block. If not in a // comment, just does a normal newline."
   "Keymap used in Delphi mode.")
 
 (defconst delphi-mode-syntax-table (make-syntax-table)
-  "Delphi mode's syntax table. It is just a standard syntax table.
+  "Delphi mode's syntax table.  It is just a standard syntax table.
 This is ok since we do our own keyword/comment/string face coloring.")
 
 ;;;###autoload
@@ -1976,7 +1977,7 @@ This is ok since we do our own keyword/comment/string face coloring.")
 \\[delphi-fill-comment]\t- Fill the current comment.
 \\[delphi-new-comment-line]\t- If in a // comment, do a new comment line.
 
-M-x indent-region also works for indenting a whole region.
+\\[indent-region] also works for indenting a whole region.
 
 Customization:
 
@@ -1996,21 +1997,21 @@ Customization:
  `delphi-search-path'                 (default .)
     Directories to search when finding external units.
  `delphi-verbose'                     (default nil)
-    If true then delphi token processing progress is reported to the user.
+    If true then Delphi token processing progress is reported to the user.
 
 Coloring:
 
  `delphi-comment-face'                (default font-lock-comment-face)
-    Face used to color delphi comments.
+    Face used to color Delphi comments.
  `delphi-string-face'                 (default font-lock-string-face)
-    Face used to color delphi strings.
+    Face used to color Delphi strings.
  `delphi-keyword-face'                (default font-lock-keyword-face)
-    Face used to color delphi keywords.
+    Face used to color Delphi keywords.
  `delphi-other-face'                  (default nil)
     Face used to color everything else.
 
-Turning on Delphi mode calls the value of the variable delphi-mode-hook with
-no args, if that value is non-nil."
+Turning on Delphi mode calls the value of the variable `delphi-mode-hook'
+with no args, if that value is non-nil."
   (interactive)
   (kill-all-local-variables)
   (use-local-map delphi-mode-map)
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index d674484345a..87e5875c943 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -3566,12 +3566,12 @@ KIND is an additional string printed in the buffer."
     (insert kind)
     (indent-to 50)
     (insert (case (second info)
-              ('ebrowse-ts-member-functions "member function")
-              ('ebrowse-ts-member-variables "member variable")
-              ('ebrowse-ts-static-functions "static function")
-              ('ebrowse-ts-static-variables "static variable")
-              ('ebrowse-ts-friends (if globals-p "define" "friend"))
-              ('ebrowse-ts-types "type")
+              (ebrowse-ts-member-functions "member function")
+              (ebrowse-ts-member-variables "member variable")
+              (ebrowse-ts-static-functions "static function")
+              (ebrowse-ts-static-variables "static variable")
+              (ebrowse-ts-friends (if globals-p "define" "friend"))
+              (ebrowse-ts-types "type")
               (t "unknown"))
             "\n")))
 
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 25d1410621a..ab315f9eefd 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -648,21 +648,36 @@ detailed description of this mode.
   (set (make-local-variable 'gud-minor-mode) 'gdbmi)
   (setq comint-input-sender 'gdb-send)
   (when (ring-empty-p comint-input-ring) ; cf shell-mode
-    (let (hfile)
-      (when (catch 'done
-              (dolist (file '(".gdbinit" "~/.gdbinit"))
-                (if (file-readable-p (setq file (expand-file-name file)))
-                    (with-temp-buffer
-                      (insert-file-contents file)
-                      (and (re-search-forward
-                            "^ *set history filename  *\\(.*\\)" nil t)
-                           (file-readable-p
-                            (setq hfile (expand-file-name
-                                         (match-string 1)
-                                         (file-name-directory file))))
-                           (throw 'done t))))))
-        (set (make-local-variable 'comint-input-ring-file-name) hfile)
-        (comint-read-input-ring t))))
+    (let ((hfile (expand-file-name (or (getenv "GBDHISTFILE")
+                                       (if (eq system-type 'ms-dos)
+                                           "_gdb_history"
+                                         ".gdb_history"))))
+          ;; gdb defaults to 256, but we'll default to comint-input-ring-size.
+          (hsize (getenv "HISTSIZE")))
+      (dolist (file (append '("~/.gdbinit")
+                            (unless (string-equal (expand-file-name ".")
+                                              (expand-file-name "~"))
+                              '(".gdbinit"))))
+        (if (file-readable-p (setq file (expand-file-name file)))
+            (with-temp-buffer
+              (insert-file-contents file)
+              ;; TODO? check for "set history save\\(  *on\\)?" and do
+              ;; not use history otherwise?
+              (while (re-search-forward
+                      "^ *set history \\(filename\\|size\\)  *\\(.*\\)" nil t)
+                (cond ((string-equal (match-string 1) "filename")
+                       (setq hfile (expand-file-name
+                                    (match-string 2)
+                                    (file-name-directory file))))
+                      ((string-equal (match-string 1) "size")
+                       (setq hsize (match-string 2))))))))
+      (and (stringp hsize)
+           (integerp (setq hsize (string-to-number hsize)))
+           (> hsize 0)
+           (set (make-local-variable 'comint-input-ring-size) hsize))
+      (if (stringp hfile)
+          (set (make-local-variable 'comint-input-ring-file-name) hfile))
+      (comint-read-input-ring t)))
   (gud-def gud-tbreak "tbreak %f:%l" "\C-t"
            "Set temporary breakpoint at current line.")
   (gud-def gud-jump
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 53918b903ee..47cbdf19ed2 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3127,7 +3127,9 @@ class of the file (using s to separate nested class ids)."
    ("^document\\s-.*\\(\n\\)" (1 "< b"))
    ("^end\\(\\>\\)"
     (1 (ignore
-        (unless (eq (match-beginning 0) (point-min))
+        (when (and (> (match-beginning 0) (point-min))
+                   (eq 1 (nth 7 (save-excursion
+                                  (syntax-ppss (1- (match-beginning 0)))))))
           ;; We change the \n in front, which is more difficult, but results
           ;; in better highlighting.  If the doc is empty, the single \n is
           ;; both the beginning and the end of the docstring, which can't be
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 9d40b4d8fd7..c8b156c5441 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -974,7 +974,7 @@ With ARG, do it many times.  Negative ARG means move forward."
                    (goto-char (scan-sexps (1+ (point)) -1))
                    (case (char-before)
                      (?% (forward-char -1))
-                     ('(?q ?Q ?w ?W ?r ?x)
+                     ((?q ?Q ?w ?W ?r ?x)
                       (if (eq (char-before (1- (point))) ?%) (forward-char -2))))
                    nil)
                   ((looking-at "\\s\"\\|\\\\\\S_")