[Emacs-diffs] /srv/bzr/emacs/trunk r111858: Merge from emacs-24; up to r111291

[Glenn Morris]

------------------------------------------------------------
revno: 111858 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-02-22 09:13:05 -0800
message:
  Merge from emacs-24; up to r111291
modified:
  doc/emacs/ChangeLog
  doc/emacs/ack.texi
  doc/emacs/emacs.texi
  doc/misc/ChangeLog
  doc/misc/flymake.texi
  etc/DEBUG
  lisp/ChangeLog
  lisp/isearch.el
  lisp/replace.el
  lisp/textmodes/ispell.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-02-21 06:03:02 +0000
+++ b/doc/emacs/ChangeLog       2013-02-22 17:13:05 +0000
@@ -1,3 +1,8 @@
+2013-02-22  Glenn Morris  <address@hidden>
+
+       * ack.texi (Acknowledgments):
+       * emacs.texi (Acknowledgments): Small updates.
+
 2013-02-21  Glenn Morris  <address@hidden>
 
        * files.texi (File Conveniences): Not just GIFs can be animated.

=== modified file 'doc/emacs/ack.texi'
--- a/doc/emacs/ack.texi        2013-02-13 08:50:44 +0000
+++ b/doc/emacs/ack.texi        2013-02-22 17:13:05 +0000
@@ -202,7 +202,7 @@
 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 @@
 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},

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2013-01-01 09:11:05 +0000
+++ b/doc/emacs/emacs.texi      2013-02-22 17:10:58 +0000
@@ -1375,7 +1375,7 @@
 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

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-02-21 22:42:56 +0000
+++ b/doc/misc/ChangeLog        2013-02-22 17:13:05 +0000
@@ -1,3 +1,7 @@
+2013-02-22  Glenn Morris  <address@hidden>
+
+       * flymake.texi (Syntax check statuses): Fix multitable continued rows.
+
 2013-02-21  Paul Eggert  <address@hidden>
 
        * Makefile.in (html): New rule.

=== modified file 'doc/misc/flymake.texi'
--- a/doc/misc/flymake.texi     2013-02-12 17:36:54 +0000
+++ b/doc/misc/flymake.texi     2013-02-22 02:16:44 +0000
@@ -210,14 +210,14 @@
 @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
address@hidden, 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 @@
 @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.

=== modified file 'etc/DEBUG'
--- a/etc/DEBUG 2013-01-01 09:11:05 +0000
+++ b/etc/DEBUG 2013-02-22 09:22:21 +0000
@@ -8,17 +8,28 @@
 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-22 14:05:38 +0000
+++ b/lisp/ChangeLog    2013-02-22 17:13:05 +0000
@@ -1,3 +1,16 @@
+2013-02-22  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp.el (tramp-tramp-file-p): Fix docstring.

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2013-02-02 03:38:21 +0000
+++ b/lisp/isearch.el   2013-02-22 17:13:05 +0000
@@ -2961,8 +2961,15 @@
     (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 @@
                          (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)))))

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2013-02-16 09:26:42 +0000
+++ b/lisp/replace.el   2013-02-22 17:13:05 +0000
@@ -2203,6 +2203,7 @@
             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))))
 

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2013-01-21 16:05:30 +0000
+++ b/lisp/textmodes/ispell.el  2013-02-22 17:13:05 +0000
@@ -2602,7 +2602,10 @@
                  (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)))