Merge from emacs-24; up to 2012-12-22T02:59:08Z!cyd@gnu.org

10 files changed, 72 insertions, 25 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 83d5b1d25ed..33f530cbadc 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-22  Glenn Morris  <rgm@gnu.org>
+
+        * ack.texi (Acknowledgments):
+        * emacs.texi (Acknowledgments): Small updates.
+
 2013-02-21  Glenn Morris  <rgm@gnu.org>
 
         * files.texi (File Conveniences): Not just GIFs can be animated.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 718a51c60db..17309f74408 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -202,7 +202,7 @@ Andrew Choi and Yamamoto Mitsuharu wrote the Carbon support, used
 prior to Emacs 23 for Mac OS.
 
 @item
-Chong Yidong was the Emacs co-maintainer from Emacs 23 onwards.  He made many
+Chong Yidong was the Emacs co-maintainer from Emacs 23 to 24.3.  He made many
 improvements to the Emacs display engine.  He also wrote
 @file{tabulated-list.el}, a generic major mode for lists of data;
 and improved support for themes and packages.
@@ -825,7 +825,7 @@ facility.  He also wrote @code{ebrowse}, the C@t{++} browser;
 and @file{rx.el}, a regular expression constructor.
 
 @item
-Stefan Monnier was the Emacs co-maintainer from Emacs 23 onwards.  He added
+Stefan Monnier was the Emacs (co-)maintainer from Emacs 23 onwards.  He added
 support for Arch and Subversion to VC, re-wrote much of the Emacs server
 to use the built-in networking primitives, and re-wrote the abbrev and
 minibuffer completion code for Emacs 23.  He also wrote @code{PCL-CVS},
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 4f11da8032a..bda7c0821c0 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1375,7 +1375,7 @@ Engster, Hans Henrik Eriksen, Michael Ernst, Ata Etemadi, Frederick
 Farnbach, Oscar Figueiredo, Fred Fish, Steve Fisk, Karl Fogel, Gary
 Foster, Eric S. Fraga, Romain Francoise, Noah Friedman, Andreas
 Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S.
-Galbraith, Kevin Gallagher, Kevin Gallo, Juan León Lahoz García,
+Galbraith, Kevin Gallagher, Fabián E. Gallina, Kevin Gallo, Juan León Lahoz García,
 Howard Gayle, Daniel German, Stephen Gildea, Julien Gilles, David
 Gillespie, Bob Glickstein, Deepak Goel, David De La Harpe Golden, Boris
 Goldowsky, David Goodger, Chris Gray, Kevin Greiner, Michelangelo Grigni, Odd
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4f827073b2f..9a4f4c10610 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-22  Glenn Morris  <rgm@gnu.org>
+
+        * flymake.texi (Syntax check statuses): Fix multitable continued rows.
+
 2013-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (html): New rule.
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 79259a76503..5dedda16ee1 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -210,14 +210,14 @@ The following statuses are defined.
 @multitable @columnfractions 0.25 0.75
 @item Flymake* or Flymake:E/W*
 @tab  Flymake is currently running. For the second case, E/W contains the
-      error and warning count for the previous run.
+error and warning count for the previous run.
 
 @item Flymake
 @tab  Syntax check is not running. Usually this means syntax check was
-      successfully passed (no errors, no warnings). Other possibilities are:
-      syntax check was killed as a result of executing
-      @code{flymake-compile}, or syntax check cannot start as compilation
-      is currently in progress.
+successfully passed (no errors, no warnings). Other possibilities are:
+syntax check was killed as a result of executing
+@code{flymake-compile}, or syntax check cannot start as compilation
+is currently in progress.
 
 @item Flymake:E/W
 @tab  Number of errors/warnings found by the syntax check process.
@@ -232,9 +232,9 @@ OFF for the buffer.
 @multitable @columnfractions 0.25 0.75
 @item CFGERR
 @tab  Syntax check process returned nonzero exit code, but no
-      errors/warnings were reported. This indicates a possible configuration
-      error (for example, no suitable error message patterns for the
-      syntax check tool).
+errors/warnings were reported. This indicates a possible configuration
+error (for example, no suitable error message patterns for the
+syntax check tool).
 
 @item NOMASTER
 @tab  Flymake was unable to find master file for the current buffer.
diff --git a/etc/DEBUG b/etc/DEBUG
index 6cd0abeeaa5..709e8987d03 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -8,17 +8,28 @@ See the end of the file for license conditions.
 read the Windows-specific section near the end of this document.]
 
 ** When you debug Emacs with GDB, you should start it in the directory
-where the executable was made.  That directory has a .gdbinit file
-that defines various "user-defined" commands for debugging Emacs.
-(These commands are described below under "Examining Lisp object
-values" and "Debugging Emacs Redisplay problems".)
-
-** When you are trying to analyze failed assertions, it will be
-essential to compile Emacs either completely without optimizations or
-at least (when using GCC) with the -fno-crossjumping option.  Failure
-to do so may make the compiler recycle the same abort call for all
-assertions in a given function, rendering the stack backtrace useless
-for identifying the specific failed assertion.
+where the executable was made (the 'src' directory in the Emacs source
+tree).  That directory has a .gdbinit file that defines various
+"user-defined" commands for debugging Emacs.  (These commands are
+described below under "Examining Lisp object values" and "Debugging
+Emacs Redisplay problems".)
+
+Some GDB versions by default do not automatically load .gdbinit files
+in the directory where you invoke GDB.  With those versions of GDB,
+you will see a warning when GDB starts, like this:
+
+  warning: File ".../src/.gdbinit" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load".
+
+There are several ways to overcome that difficulty, they are all
+described in the node "Auto-loading safe path" in the GDB user manual.
+
+** When you are trying to analyze failed assertions or backtraces, it
+will be essential to compile Emacs either completely without
+optimizations (set CFLAGS to "-O0 -g3") or at least (when using GCC)
+with the -fno-crossjumping option in CFLAGS.  Failure to do so may
+make the compiler recycle the same abort call for all assertions in a
+given function, rendering the stack backtrace useless for identifying
+the specific failed assertion.
 
 ** It is a good idea to run Emacs under GDB (or some other suitable
 debugger) *all the time*.  Then, when Emacs crashes, you will be able
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6496fe998d3..1555dfc43b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-22  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-lazy-highlight-new-loop):
+        Set `isearch-lazy-highlight-start' and `isearch-lazy-highlight-end'
+        to `isearch-other-end' if it is not nil.  (Bug#13402)
+
+        * replace.el (replace-highlight): Let-bind `isearch-other-end'
+        to `match-beg'.
+
+        * textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
+        Let-bind `isearch-other-end' to `start', `isearch-forward' to t
+        and `isearch-error' to nil.
+
 2013-02-22  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-tramp-file-p): Fix docstring.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 31b1918429f..b36b250738a 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2961,8 +2961,15 @@ by other Emacs features."
     (setq isearch-lazy-highlight-window       (selected-window)
           isearch-lazy-highlight-window-start (window-start)
           isearch-lazy-highlight-window-end   (window-end)
-          isearch-lazy-highlight-start        (point)
-          isearch-lazy-highlight-end          (point)
+          ;; Start lazy-highlighting at the beginning of the found
+          ;; match (`isearch-other-end').  If no match, use point.
+          ;; One of the next two variables (depending on search direction)
+          ;; is used to define the starting position of lazy-highlighting
+          ;; and also to remember the current position of point between
+          ;; calls of `isearch-lazy-highlight-update', and another variable
+          ;; is used to define where the wrapped search must stop.
+          isearch-lazy-highlight-start        (or isearch-other-end (point))
+          isearch-lazy-highlight-end          (or isearch-other-end (point))
           isearch-lazy-highlight-wrapped      nil
           isearch-lazy-highlight-last-string  isearch-string
           isearch-lazy-highlight-case-fold-search isearch-case-fold-search
@@ -3060,6 +3067,9 @@ Attempt to do the search exactly the way the pending Isearch would."
                           (overlay-put ov 'priority 1000)
                           (overlay-put ov 'face lazy-highlight-face)
                           (overlay-put ov 'window (selected-window))))
+                      ;; Remember the current position of point for
+                      ;; the next call of `isearch-lazy-highlight-update'
+                      ;; when `lazy-highlight-max-at-a-time' is too small.
                       (if isearch-lazy-highlight-forward
                           (setq isearch-lazy-highlight-end (point))
                         (setq isearch-lazy-highlight-start (point)))))
diff --git a/lisp/replace.el b/lisp/replace.el
index 0b8aaa7d349..7f9ea869333 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2203,6 +2203,7 @@ make, or the user didn't cancel the call."
              replace-regexp-lax-whitespace)
             (isearch-case-fold-search case-fold-search)
             (isearch-forward t)
+            (isearch-other-end match-beg)
             (isearch-error nil))
         (isearch-lazy-highlight-new-loop range-beg range-end))))
 
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index dbcf3910db8..50a10dba9a2 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2602,7 +2602,10 @@ The variable `ispell-highlight-face' selects the face to use for highlighting."
                   (regexp-quote (buffer-substring-no-properties start end))
                   "\\b"))
                 (isearch-regexp t)
-                (isearch-case-fold-search nil))
+                (isearch-case-fold-search nil)
+                (isearch-forward t)
+                (isearch-other-end start)
+                (isearch-error nil))
             (isearch-lazy-highlight-new-loop
              (if (boundp 'reg-start) reg-start)
              (if (boundp 'reg-end)   reg-end)))