17 files changed, 142 insertions, 80 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fba2817b1e..fdf12be0a1c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,48 @@
+2013-02-02  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Identify g++ template instantiation trace.  (Bug#12287)
+        (compilation-mode-hook, compilation-start-hook)
+        (compilation-window-height): Simplify docstrings.  (Bug#13379)
+
+2013-02-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mouse.el (mouse-drag-track): Always deactivate the mark before
+        running the final event's command since that command is in charge of
+        activating the mark if needed (bug#13523).
+
+2013-02-02  Juri Linkov  <juri@jurta.org>
+
+        * replace.el (perform-replace): Move let-bindings of isearch-*
+        variables deeper to the loop that searches for the next match.
+        Add bindings for `isearch-nonincremental' and `isearch-adjusted'.
+        Use `isearch-search-fun-default' instead of `isearch-search-fun'.
+        (Bug#13579)
+
+        * isearch.el (isearch-search-fun-default): Check for null
+        first element of isearch-cmds as a precaution when it's used
+        with inactive isearch.
+
+2013-02-02  Andrew W. Nosenko  <andrew.w.nosenko@gmail.com>  (tiny change)
+
+        * net/tramp.el (tramp-check-for-regexp): Avoid "Args out of range"
+        error when buffer in question is narrowed so position 1 is out of
+        visible part.
+
+2013-02-02  Glenn Morris  <rgm@gnu.org>
+
+        * textmodes/remember.el (remember-clipboard): Doc fix.
+
+2013-02-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table
+        properties (bug#13179).
+
+2013-02-02  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-regexp-alist): Use variable grep-match-face
+        instead of hard-coded default face `match'.  (Bug#9438)
+
 2012-02-01  Christopher Schmidt  <christopher@ch.ristopher.com>
 
         * vc/vc-arch.el (vc-arch-registered):
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index d876b65303c..e8720bc6624 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -4,7 +4,7 @@
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: Eric M. Ludlam  <zappo@gnu.org>
-;; Version: 1.1
+;; Version: 2.0
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -35,7 +35,7 @@
 
 (declare-function inversion-find-version "inversion")
 
-(defconst cedet-version "1.1"
+(defconst cedet-version "2.0"
   "Current version of CEDET.")
 
 (defconst cedet-packages
@@ -43,12 +43,12 @@
     ;;PACKAGE   MIN-VERSION      INSTALLDIR  DOCDIR
     (cedet         ,cedet-version "common"   "common"           )
     (eieio         "1.4"           nil       "eieio"       )
-    (semantic      "2.1"           nil       "semantic/doc")
-    (srecode       "1.1"           nil       "srecode"     )
-    (ede           "1.1"           nil       "ede"         )
+    (semantic      "2.2"           nil       "semantic/doc")
+    (srecode       "1.2"           nil       "srecode"     )
+    (ede           "1.2"           nil       "ede"         )
     (speedbar      "1.0.4"         nil       "speedbar"    )
-    (cogre         "1.1"           nil       "cogre"       )
-    (cedet-contrib "1.1"           "contrib" nil           )
+    (cogre         "1.2"           nil       "cogre"       )
+    (cedet-contrib "1.2"           "contrib" nil           )
     )
   "Table of CEDET packages to install.")
 
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 12b8f558d65..3867f628b93 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
-;; Version: 1.0
+;; Version: 1.2
 
 ;; This file is part of GNU Emacs.
 
@@ -60,7 +60,7 @@
 (declare-function ede-up-directory "ede/files")
 (declare-function semantic-lex-make-spp-table "semantic/lex-spp")
 
-(defconst ede-version "1.0"
+(defconst ede-version "1.2"
   "Current version of the Emacs EDE.")
 
 ;;; Code:
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index decd3b15812..edf2d0cb21a 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax tools
-;; Version: 2.1beta
+;; Version: 2.2
 
 ;; This file is part of GNU Emacs.
 
@@ -38,7 +38,7 @@
 (require 'semantic/tag)
 (require 'semantic/lex)
 
-(defvar semantic-version "2.1beta"
+(defvar semantic-version "2.2"
   "Current version of Semantic.")
 
 (declare-function inversion-test "inversion")
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 3201374bc92..2e2cb8a3f80 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: codegeneration
-;; Version: 1.0
+;; Version: 1.2
 
 ;; This file is part of GNU Emacs.
 
@@ -41,7 +41,7 @@
 (require 'mode-local)
 (load "srecode/loaddefs" nil 'nomessage)
 
-(defvar srecode-version "1.0"
+(defvar srecode-version "1.2"
   "Current version of the Semantic Recoder.")
 
 ;;; Code:
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 7a22e1222c9..626bc0f6dc6 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 1995-1996, 1998-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Version: 1.3
+;; Version: 1.4
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -46,7 +46,7 @@
 
 (eval-when-compile (require 'cl))       ;FIXME: Use cl-lib!
 
-(defvar eieio-version "1.3"
+(defvar eieio-version "1.4"
   "Current version of EIEIO.")
 
 (defun eieio-version ()
diff --git a/lisp/isearch.el b/lisp/isearch.el
index e16e3840d0d..31b1918429f 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2520,6 +2520,7 @@ Can be changed via `isearch-search-fun-function' for special needs."
       ;; the user adds and removes characters in the search string
       ;; (or when using nonincremental word isearch)
       (let ((lax (not (or isearch-nonincremental
+                          (null (car isearch-cmds))
                           (eq (length isearch-string)
                               (length (isearch--state-string
                                        (car isearch-cmds))))))))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 9c7bf6f9c36..a1aa104495a 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -880,9 +880,9 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
                      (copy-region-as-kill (mark) (point)))))
 
           ;; Otherwise, run binding of terminating up-event.
+          (deactivate-mark)
           (if do-multi-click
               (goto-char start-point)
-            (deactivate-mark)
             (unless moved-off-start
               (pop-mark)))
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 4f31e95aeff..1dee9e89676 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3413,7 +3413,9 @@ Erase echoed commands if exists."
                      0 (min tramp-echo-mark-marker-length (1- (point-max))))
                     (tramp-compat-funcall
                      'buffer-substring-no-properties
-                     1 (min (1+ tramp-echo-mark-marker-length) (point-max))))))
+                     (point-min)
+                     (min (+ (point-min) tramp-echo-mark-marker-length)
+                          (point-max))))))
       ;; No echo to be handled, now we can look for the regexp.
       ;; Sometimes, lines are much to long, and we run into a "Stack
       ;; overflow in regexp matcher".  For example, //DIRED// lines of
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 0711bc983e8..4b3fc91b0ff 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -142,7 +142,7 @@
 
 (defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]")
 ;;   Matches any character but a _, #, /, ", \, or newline.  N.B. _" starts a
-;; localisation string in gawk 3.1
+;; localization string in gawk 3.1
 (defconst c-awk-harmless-line-string*-re
   (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*"))
 ;;   Matches a (possibly empty) sequence of chars without unescaped /, ", \,
@@ -795,7 +795,8 @@
       (setq anchor (point))
       (search-forward-regexp c-awk-harmless-string*-here-re nil t)
       ;; We are now looking at either a " or a / or a brace/paren/semicolon.
-      ;; Do our thing on the string, regexp or divsion sign or update our state.
+      ;; Do our thing on the string, regexp or division sign or update
+      ;; our state.
       (setq anchor-state-/div
             (cond
              ((looking-at "_?\"")
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index eb73b77bf52..d2a9617e28e 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -42,24 +42,21 @@
 
 ;;;###autoload
 (defcustom compilation-mode-hook nil
-  "List of hook functions run by `compilation-mode' (see `run-mode-hooks')."
+  "List of hook functions run by `compilation-mode'."
   :type 'hook
   :group 'compilation)
 
 ;;;###autoload
 (defcustom compilation-start-hook nil
-  "List of hook functions run by `compilation-start' on the compilation process.
-\(See `run-hook-with-args').
-If you use \"omake -P\" and do not want \\[save-buffers-kill-terminal] to ask whether you want
-the compilation to be killed, you can use this hook:
-  (add-hook 'compilation-start-hook
-    (lambda (process) (set-process-query-on-exit-flag process nil)) nil t)"
+  "Hook run after starting a new compilation process.
+The hook is run with one argument, the new process."
   :type 'hook
   :group 'compilation)
 
 ;;;###autoload
 (defcustom compilation-window-height nil
-  "Number of lines in a compilation window.  If nil, use Emacs default."
+  "Number of lines in a compilation window.
+If nil, use Emacs default."
   :type '(choice (const :tag "Default" nil)
                  integer)
   :group 'compilation)
@@ -265,7 +262,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \\([0-9]+\\)\\(?:-\\(?4:[0-9]+\\)\\(?:\\.\\(?5:[0-9]+\\)\\)?\
 \\|[.:]\\(?3:[0-9]+\\)\\(?:-\\(?:\\(?4:[0-9]+\\)\\.\\)?\\(?5:[0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
- *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
+ *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|\\[ skipping .+ \\]\\|\
+\\(?:instantiated\\|required\\) from\\|[Nn]ote\\)\\|\
  *[Ee]rror\\|[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 4) (3 . 5) (6 . 7))
 
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ef321addf24..d8c39f2ddef 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -359,7 +359,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
         (when grep-highlight-matches
           (let* ((beg (match-end 0))
                  (end (save-excursion (goto-char beg) (line-end-position)))
-                 (mbeg (text-property-any beg end 'font-lock-face 'match)))
+                 (mbeg (text-property-any beg end 'font-lock-face grep-match-face)))
             (when mbeg
               (- mbeg beg)))))
       .
@@ -367,7 +367,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
         (when grep-highlight-matches
           (let* ((beg (match-end 0))
                  (end (save-excursion (goto-char beg) (line-end-position)))
-                 (mbeg (text-property-any beg end 'font-lock-face 'match))
+                 (mbeg (text-property-any beg end 'font-lock-face grep-match-face))
                  (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end))))
             (when mend
               (- mend beg)))))))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index be718135f99..20673866bc4 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1304,6 +1304,12 @@ Fill comments, backslashed lines, and variable definitions specially."
         (save-restriction
           (narrow-to-region beginning end)
           (makefile-backslash-region (point-min) (point-max) t)
+          ;; Backslashed newlines are marked as punctuation, so when
+          ;; fill-delete-newlines turns the LF into SPC, we end up with spaces
+          ;; which back-to-indentation (called via fill-newline ->
+          ;; fill-indent-to-left-margin -> indent-line-to) thinks are real code
+          ;; (bug#13179).
+          (remove-text-properties (point-min) (point-max) '(syntax-table))
           (let ((fill-paragraph-function nil)
                 ;; Adjust fill-column to allow space for the backslash.
                 (fill-column (- fill-column 1)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2cb108cc316..35c5ba19e33 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2334,7 +2334,7 @@ Argument OUTPUT is a string with the output from the comint process."
               ;; encounters an exception, it prints the _entire_ stack
               ;; trace.  To handle all of these cases, we want to find
               ;; the _last_ stack frame printed in the most recent
-              ;; batch of output, then jump to the corrsponding
+              ;; batch of output, then jump to the corresponding
               ;; file/line number.
               (goto-char (point-max))
               (when (re-search-backward python-pdbtrack-stacktrace-info-regexp nil t)
diff --git a/lisp/replace.el b/lisp/replace.el
index fb251821445..7757426cf95 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1819,19 +1819,6 @@ make, or the user didn't cancel the call."
             case-fold-search))
          (nocasify (not (and case-replace case-fold-search)))
          (literal (or (not regexp-flag) (eq regexp-flag 'literal)))
-         (search-function
-          (or (if regexp-flag
-                  replace-re-search-function
-                replace-search-function)
-              (let ((isearch-regexp regexp-flag)
-                    (isearch-word delimited-flag)
-                    (isearch-lax-whitespace
-                     replace-lax-whitespace)
-                    (isearch-regexp-lax-whitespace
-                     replace-regexp-lax-whitespace)
-                    (isearch-case-fold-search case-fold-search)
-                    (isearch-forward t))
-                (isearch-search-fun))))
          (search-string from-string)
          (real-match-data nil)       ; The match data for the current match.
          (next-replacement nil)
@@ -1894,39 +1881,62 @@ make, or the user didn't cancel the call."
         ;; Loop finding occurrences that perhaps should be replaced.
         (while (and keep-going
                     (not (or (eobp) (and limit (>= (point) limit))))
-                    ;; Use the next match if it is already known;
-                    ;; otherwise, search for a match after moving forward
-                    ;; one char if progress is required.
-                    (setq real-match-data
-                          (cond ((consp match-again)
-                                 (goto-char (nth 1 match-again))
-                                 (replace-match-data
-                                  t real-match-data match-again))
-                                ;; MATCH-AGAIN non-nil means accept an
-                                ;; adjacent match.
-                                (match-again
-                                 (and
-                                  (funcall search-function search-string
-                                           limit t)
-                                  ;; For speed, use only integers and
-                                  ;; reuse the list used last time.
-                                  (replace-match-data t real-match-data)))
-                                ((and (< (1+ (point)) (point-max))
-                                      (or (null limit)
-                                          (< (1+ (point)) limit)))
-                                 ;; If not accepting adjacent matches,
-                                 ;; move one char to the right before
-                                 ;; searching again.  Undo the motion
-                                 ;; if the search fails.
-                                 (let ((opoint (point)))
-                                   (forward-char 1)
-                                   (if (funcall
-                                        search-function search-string
-                                        limit t)
-                                       (replace-match-data
-                                        t real-match-data)
-                                     (goto-char opoint)
-                                     nil))))))
+                    ;; Let-bind global isearch-* variables to values used
+                    ;; to search the next replacement.  These let-bindings
+                    ;; should be effective both at the time of calling
+                    ;; `isearch-search-fun-default' and also at the
+                    ;; time of funcalling `search-function'.
+                    ;; These isearch-* bindings can't be placed higher
+                    ;; outside of this loop because then another I-search
+                    ;; used after `recursive-edit' might override them.
+                    (let* ((isearch-regexp regexp-flag)
+                           (isearch-word delimited-flag)
+                           (isearch-lax-whitespace
+                            replace-lax-whitespace)
+                           (isearch-regexp-lax-whitespace
+                            replace-regexp-lax-whitespace)
+                           (isearch-case-fold-search case-fold-search)
+                           (isearch-adjusted nil)
+                           (isearch-nonincremental t) ; don't use lax word mode
+                           (isearch-forward t)
+                           (search-function
+                            (or (if regexp-flag
+                                    replace-re-search-function
+                                  replace-search-function)
+                                (isearch-search-fun-default))))
+                      ;; Use the next match if it is already known;
+                      ;; otherwise, search for a match after moving forward
+                      ;; one char if progress is required.
+                      (setq real-match-data
+                            (cond ((consp match-again)
+                                   (goto-char (nth 1 match-again))
+                                   (replace-match-data
+                                    t real-match-data match-again))
+                                  ;; MATCH-AGAIN non-nil means accept an
+                                  ;; adjacent match.
+                                  (match-again
+                                   (and
+                                    (funcall search-function search-string
+                                             limit t)
+                                    ;; For speed, use only integers and
+                                    ;; reuse the list used last time.
+                                    (replace-match-data t real-match-data)))
+                                  ((and (< (1+ (point)) (point-max))
+                                        (or (null limit)
+                                            (< (1+ (point)) limit)))
+                                   ;; If not accepting adjacent matches,
+                                   ;; move one char to the right before
+                                   ;; searching again.  Undo the motion
+                                   ;; if the search fails.
+                                   (let ((opoint (point)))
+                                     (forward-char 1)
+                                     (if (funcall
+                                          search-function search-string
+                                          limit t)
+                                         (replace-match-data
+                                          t real-match-data)
+                                       (goto-char opoint)
+                                       nil)))))))
 
           ;; Record whether the match is nonempty, to avoid an infinite loop
           ;; repeatedly matching the same empty string.
diff --git a/lisp/simple.el b/lisp/simple.el
index 3481a736648..d7541f68778 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -802,7 +802,7 @@ other words, it will work just like `just-one-space' command."
               (unless (= start end)
                 (cons orig-pos (buffer-substring start (point)))))
         ;; If this run causes no change in buffer content, delete all spaces,
-        ;; otherwise delete all excees spaces.
+        ;; otherwise delete all excess spaces.
         (delete-region (if (and (not single-shot) (zerop n) (= mid end))
                            start mid) end)
         (insert (make-string n ?\s))))
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 6ff4c720b71..eeb04ef250f 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -432,8 +432,7 @@ If you want to remember a region, supply a universal prefix to
 ;;;###autoload
 (defun remember-clipboard ()
   "Remember the contents of the current clipboard.
-Most useful for remembering things from Netscape or other X Windows
-application."
+Most useful for remembering things from other applications."
   (interactive)
   (remember (current-kill 0)))