merge trunk

17 files changed, 128 insertions, 78 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index e22eb84cef4..89d686a63de 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in ($(srcdir)/ja-dic/ja-dic.el): Use batch-skkdic-convert.
+
 2013-03-18  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in ($(srcdir)/ja-dic/ja-dic.el): New target.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 23b3bc7cbf6..0242244295e 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -146,8 +146,9 @@ leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
 
 $(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
         @$(MKDIR_P) $(srcdir)/ja-dic
-        $(RUN_EMACS) -l $(buildlisppath)/international/ja-dic-cnv \
-          --eval '(skkdic-convert "$(srcdir)/SKK-DIC/SKK-JISYO.L" "$(srcdir)/ja-dic")'
+        $(RUN_EMACS) -batch -l $(buildlisppath)/international/ja-dic-cnv \
+          -f batch-skkdic-convert -dir "$(srcdir)/ja-dic" \
+          "$(srcdir)/SKK-DIC/SKK-JISYO.L"
 
 ## Following adapted from lisp/Makefile.in.
 setwins=wins="${srcdir}/ja-dic quail"; \
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c2b17ff0fa..392cc9ac2fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,38 @@
+2013-03-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Suppress unnecessary non-ASCII chatter during build process.
+        * international/ja-dic-cnv.el (skkdic-collect-okuri-nasi)
+        (batch-skkdic-convert): Suppress most of the chatter.
+        It's not needed so much now that machines are faster,
+        and its non-ASCII component was confusing; see Dmitry Gutov in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00508.html>.
+
+2013-03-20  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-chop): Fix bug#10994.
+
+2013-03-19  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * whitespace.el (whitespace-font-lock, whitespace-font-lock-mode):
+        Remove vars.
+        (whitespace-color-on, whitespace-color-off): Use
+        `font-lock-fontify-buffer' (Bug#13817).
+
+2013-03-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mouse.el (mouse--down-1-maybe-follows-link): Fix follow-link
+        remapping in mode-line.
+        (mouse-on-link-p): Also check [mode-line follow-link] bindings.
+
+2013-03-19  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * whitespace.el (whitespace-color-on): Use `prepend' OVERRIDE
+        value for `whitespace-line' face (Bug#13875).
+        (whitespace-font-lock-keywords): Change description.
+        (whitespace-color-on): Don't save `font-lock-keywords' value, save
+        the constructed keywords instead.
+        (whitespace-color-off): Use `font-lock-remove-keywords' (Bug#13817).
+
 2013-03-19  Leo Liu  <sdl.web@gmail.com>
 
         * progmodes/compile.el (compilation-display-error): New command.
diff --git a/lisp/ido.el b/lisp/ido.el
index 589f44175eb..7ace1811daa 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3150,13 +3150,15 @@ for first matching file."
     (exit-minibuffer)))
 
 (defun ido-chop (items elem)
-  "Remove all elements before ELEM and put them at the end of ITEMS."
+  "Remove all elements before ELEM and put them at the end of ITEMS.
+Use `eq' for comparison."
   (let ((ret nil)
         (next nil)
         (sofar nil))
     (while (not ret)
       (setq next (car items))
-      (if (equal next elem)
+      ;; Use `eq' to avoid bug http://debbugs.gnu.org/10994
+      (if (eq next elem)
           (setq ret (append items (nreverse sofar)))
         ;; else
         (progn
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 5382dbe3ad7..41a31004194 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -279,9 +279,9 @@
                 skkdic-okuri-nasi-entries-count
                 (1+ skkdic-okuri-nasi-entries-count))
           (setq ratio (floor (/ (* (point) 100.0) (point-max))))
-          (if (/= ratio prev-ratio)
+          (if (/= (/ prev-ratio 10) (/ ratio 10))
               (progn
-                (message "collected %2d%% %s ..." ratio kana)
+                (message "collected %2d%% ..." ratio)
                 (setq prev-ratio ratio)))
           (while candidates
             (let ((entry (lookup-nested-alist (car candidates)
@@ -304,12 +304,12 @@
       (while l
         (let ((kana (car (car l)))
               (candidates (cdr (car l))))
-          (setq ratio (/ (* count 1000) skkdic-okuri-nasi-entries-count)
+          (setq ratio (/ (* count 100) skkdic-okuri-nasi-entries-count)
                 count (1+ count))
-          (if (/= prev-ratio (/ ratio 10))
+          (if (/= (/ prev-ratio 10) (/ ratio 10))
               (progn
-                (message "processed %2d%% %s ..." (/ ratio 10) kana)
-                (setq prev-ratio (/ ratio 10))))
+                (message "processed %2d%% ..." ratio)
+                (setq prev-ratio ratio)))
           (if (setq candidates
                     (skkdic-reduced-candidates skkbuf kana candidates))
               (progn
@@ -330,7 +330,7 @@ The name of generated file is specified by the variable `ja-dic-filename'."
   (interactive "FSKK dictionary file: ")
   (message "Reading file \"%s\" ..." filename)
   (let* ((coding-system-for-read 'euc-japan)
-         (skkbuf (get-buffer-create " *skkdic-unnannotated*"))
+         (skkbuf (get-buffer-create " *skkdic-unannotated*"))
          (buf (get-buffer-create "*skkdic-work*")))
     ;; Set skkbuf to an unannotated copy of the dictionary.
     (with-current-buffer skkbuf
@@ -433,12 +433,7 @@ To get complete usage, invoke:
             (setq targetdir (expand-file-name (car command-line-args-left)))
             (setq command-line-args-left (cdr command-line-args-left))))
       (setq filename (expand-file-name (car command-line-args-left)))
-      (message "Converting %s to %s ..." filename ja-dic-filename)
-      (message "It takes around 10 minutes even on Sun SS20.")
-      (skkdic-convert filename targetdir)
-      (message "Do byte-compile the created file by:")
-      (message "  %% emacs -batch -f batch-byte-compile %s" ja-dic-filename)
-      ))
+      (skkdic-convert filename targetdir)))
   (kill-emacs 0))
 
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index ea6b1b04de0..333a1cef703 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -128,7 +128,11 @@ Expects to be bound to `down-mouse-1' in `key-translation-map'."
                 (put newup 'event-kind (get (car event) 'event-kind))
                 (put newdown 'event-kind (get (car this-event) 'event-kind))
                 (push (cons newup (cdr event)) unread-command-events)
-                (vector (cons newdown (cdr this-event))))
+                ;; Modify the event in place, so read-key-sequence doesn't
+                ;; generate a second fake prefix key (see fake_prefixed_keys in
+                ;; src/keyboard.c).
+                (setcar this-event newdown)
+                (vector this-event))
             (push event unread-command-events)
             nil))))))
 
@@ -760,6 +764,9 @@ at the same position."
                   mouse-1-click-in-non-selected-windows
                   (eq (selected-window) (posn-window pos)))
               (or (mouse-posn-property pos 'follow-link)
+                  (let ((area (posn-area pos)))
+                    (when area
+                      (key-binding (vector area 'follow-link) nil t pos)))
                   (key-binding [follow-link] nil t pos)))))
     (cond
      ((eq action 'mouse-face)
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index b0bb610aa3a..c32155f5430 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1861,14 +1861,8 @@ cleaning up these problems."
 ;;;; Internal functions
 
 
-(defvar whitespace-font-lock-mode nil
-  "Used to remember whether a buffer had font lock mode on or not.")
-
-(defvar whitespace-font-lock nil
-  "Used to remember whether a buffer initially had font lock on or not.")
-
 (defvar whitespace-font-lock-keywords nil
-  "Used to save locally `font-lock-keywords' value.")
+  "Used to save the value `whitespace-color-on' adds to `font-lock-keywords'.")
 
 
 (defconst whitespace-help-text
@@ -2106,8 +2100,6 @@ resultant list will be returned."
   ;; prepare local hooks
   (add-hook 'write-file-functions 'whitespace-write-file-hook nil t)
   ;; create whitespace local buffer environment
-  (set (make-local-variable 'whitespace-font-lock-mode) nil)
-  (set (make-local-variable 'whitespace-font-lock) nil)
   (set (make-local-variable 'whitespace-font-lock-keywords) nil)
   (set (make-local-variable 'whitespace-display-table) nil)
   (set (make-local-variable 'whitespace-display-table-was-local) nil)
@@ -2157,10 +2149,6 @@ resultant list will be returned."
 (defun whitespace-color-on ()
   "Turn on color visualization."
   (when (whitespace-style-face-p)
-    (unless whitespace-font-lock
-      (setq whitespace-font-lock t
-            whitespace-font-lock-keywords
-            (copy-sequence font-lock-keywords)))
     ;; save current point and refontify when necessary
     (set (make-local-variable 'whitespace-point)
          (point))
@@ -2174,13 +2162,9 @@ resultant list will be returned."
          nil)
     (add-hook 'post-command-hook #'whitespace-post-command-hook nil t)
     (add-hook 'before-change-functions #'whitespace-buffer-changed nil t)
-    ;; turn off font lock
-    (set (make-local-variable 'whitespace-font-lock-mode)
-         font-lock-mode)
-    (font-lock-mode 0)
     ;; Add whitespace-mode color into font lock.
-    (font-lock-add-keywords
-     nil
+    (setq
+     whitespace-font-lock-keywords
      `(
        ,@(when (memq 'spaces whitespace-active-style)
            ;; Show SPACEs.
@@ -2209,7 +2193,7 @@ resultant list will be returned."
               ,(if (memq 'lines whitespace-active-style)
                    0                    ; whole line
                  2)                     ; line tail
-              whitespace-line t)))
+              whitespace-line prepend)))
        ,@(when (or (memq 'space-before-tab whitespace-active-style)
                    (memq 'space-before-tab::tab whitespace-active-style)
                    (memq 'space-before-tab::space whitespace-active-style))
@@ -2257,24 +2241,19 @@ resultant list will be returned."
                 ((memq 'space-after-tab::space whitespace-active-style)
                  ;; Show SPACEs after TAB (TABs).
                  (whitespace-space-after-tab-regexp 'space)))
-              1 whitespace-space-after-tab t))))
-     t)
-    ;; Now turn on font lock and highlight blanks.
-    (font-lock-mode 1)))
+              1 whitespace-space-after-tab t)))))
+    (font-lock-add-keywords nil whitespace-font-lock-keywords t)
+    (font-lock-fontify-buffer)))
 
 
 (defun whitespace-color-off ()
   "Turn off color visualization."
   ;; turn off font lock
   (when (whitespace-style-face-p)
-    (font-lock-mode 0)
     (remove-hook 'post-command-hook #'whitespace-post-command-hook t)
     (remove-hook 'before-change-functions #'whitespace-buffer-changed t)
-    (when whitespace-font-lock
-      (setq whitespace-font-lock nil
-            font-lock-keywords   whitespace-font-lock-keywords))
-    ;; restore original font lock state
-    (font-lock-mode whitespace-font-lock-mode)))
+    (font-lock-remove-keywords nil whitespace-font-lock-keywords)
+    (font-lock-fontify-buffer)))
 
 
 (defun whitespace-trailing-regexp (limit)
diff --git a/src/ChangeLog b/src/ChangeLog
index 6de0212109a..2779e5a6ea8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,17 @@
         to 1 (temporary workaround until a bug related to ASCII
         optimization is fixed).
 
+2013-03-19  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * window.c (Fwindow_combination_limit, Fset_window_combination_limit):
+        Signal error if window is not internal.  Adjust docstring.
+        (delete_all_child_windows): Use combination_limit to save the buffer.
+        (Fset_window_configuration): Adjust accordingly.
+        * print.c (syms_of_print): Initialize debugging output not here...
+        (init_print_once): ...but in a new function here.
+        * lisp.h (init_print_once): Add prototype.
+        * emacs.c (main): Add call to init_print_once.  Adjust comments.
+
 2013-03-18  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * window.c (window_resize_check, window_resize_apply)
diff --git a/src/alloc.c b/src/alloc.c
index b2703c5f961..5e30c1b20ad 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1162,7 +1162,7 @@ lisp_align_free (void *block)
 #define INTERVAL_BLOCK_SIZE \
   ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval))
 
-/* Intervals are allocated in chunks in form of an interval_block
+/* Intervals are allocated in chunks in the form of an interval_block
    structure.  */
 
 struct interval_block
diff --git a/src/coding.c b/src/coding.c
index a5b07019388..cb81375a043 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6075,7 +6075,7 @@ complement_process_encoding_system (Lisp_Object coding_system)
 static Lisp_Object adjust_coding_eol_type (struct coding_system *coding, int eol_seen);
 
 
-/* Return 1 if all the source bytes are ASCII, and return 0 otherwize.
+/* Return true iff all the source bytes are ASCII.
    By side effects, set coding->head_ascii and coding->eol_seen.  The
    value of coding->eol_seen is "logical or" of EOL_SEEN_LF,
    EOL_SEEN_CR, and EOL_SEEN_CRLF, but the value is reliable only when
diff --git a/src/dispextern.h b/src/dispextern.h
index a696abfddbb..1f269902435 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -602,8 +602,8 @@ struct glyph_pool
 
    2. Window glyph matrices on frames having frame glyph matrices.
    Such matrices are sub-matrices of their corresponding frame matrix,
-   i.e. frame glyph matrices and window glyph matrices share the same
-   glyph memory which is allocated in form of a glyph_pool structure.
+   i.e., frame glyph matrices and window glyph matrices share the same
+   glyph memory, which is allocated in the form of a glyph_pool structure.
    Glyph rows in such a window matrix are slices of frame matrix rows.
 
    2. Free-standing window glyph matrices managing their own glyph
diff --git a/src/emacs.c b/src/emacs.c
index bd33583af0c..5115126577b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1080,7 +1080,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 
   noninteractive1 = noninteractive;
 
-/* Perform basic initializations (not merely interning symbols).  */
+  /* Perform basic initializations (not merely interning symbols).  */
 
   if (!initialized)
     {
@@ -1091,8 +1091,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       init_coding_once ();
       init_syntax_once ();      /* Create standard syntax table.  */
       init_category_once ();    /* Create standard category table.  */
-                      /* Must be done before init_buffer.  */
-      init_casetab_once ();
+      init_casetab_once ();     /* Must be done before init_buffer_once.  */
       init_buffer_once ();      /* Create buffer table and some buffers.  */
       init_minibuf_once ();     /* Create list of minibuffers.  */
                                 /* Must precede init_window_once.  */
@@ -1117,6 +1116,8 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       syms_of_fileio ();
       /* Before syms_of_coding to initialize Vgc_cons_threshold.  */
       syms_of_alloc ();
+      /* May call Ffuncall and so GC, thus the latter should be initialized.  */
+      init_print_once ();
       /* Before syms_of_coding because it initializes Qcharsetp.  */
       syms_of_charset ();
       /* Before init_window_once, because it sets up the
diff --git a/src/image.c b/src/image.c
index 0d4bc82f3b4..2c0f6e3b8c1 100644
--- a/src/image.c
+++ b/src/image.c
@@ -154,15 +154,15 @@ XGetImage (Display *display, Pixmap pixmap, int x, int y,
   return pixmap;
 }
 
-/* use with imgs created by ns_image_for_XPM */
+/* Use with images created by ns_image_for_XPM.  */
 unsigned long
 XGetPixel (XImagePtr ximage, int x, int y)
 {
   return ns_get_pixel (ximage, x, y);
 }
 
-/* use with imgs created by ns_image_for_XPM; alpha set to 1;
-   pixel is assumed to be in form RGB */
+/* Use with images created by ns_image_for_XPM; alpha set to 1;
+   pixel is assumed to be in RGB form.  */
 void
 XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel)
 {
diff --git a/src/lisp.h b/src/lisp.h
index b2ab5684d4d..f526cd36a6f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3163,6 +3163,7 @@ extern Lisp_Object internal_with_output_to_temp_buffer
         (const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object);
 enum FLOAT_TO_STRING_BUFSIZE { FLOAT_TO_STRING_BUFSIZE = 350 };
 extern int float_to_string (char *, double);
+extern void init_print_once (void);
 extern void syms_of_print (void);
 
 /* Defined in doprnt.c.  */
diff --git a/src/print.c b/src/print.c
index 03b46748454..53c0d99f836 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2165,7 +2165,16 @@ print_interval (INTERVAL interval, Lisp_Object printcharfun)
   print_object (interval->plist, printcharfun, 1);
 }
 
-
+/* Initialize debug_print stuff early to have it working from the very
+   beginning.  */
+
+void
+init_print_once (void)
+{
+  DEFSYM (Qexternal_debugging_output, "external-debugging-output");
+  defsubr (&Sexternal_debugging_output);
+}
+
 void
 syms_of_print (void)
 {
@@ -2297,12 +2306,10 @@ priorities.  */);
   defsubr (&Sprint);
   defsubr (&Sterpri);
   defsubr (&Swrite_char);
-  defsubr (&Sexternal_debugging_output);
 #ifdef WITH_REDIRECT_DEBUGGING_OUTPUT
   defsubr (&Sredirect_debugging_output);
 #endif
 
-  DEFSYM (Qexternal_debugging_output, "external-debugging-output");
   DEFSYM (Qprint_escape_newlines, "print-escape-newlines");
   DEFSYM (Qprint_escape_multibyte, "print-escape-multibyte");
   DEFSYM (Qprint_escape_nonascii, "print-escape-nonascii");
diff --git a/src/window.c b/src/window.c
index df7878f42e5..5dc908f0a4d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -635,30 +635,37 @@ Return nil if WINDOW has no previous sibling.  */)
 
 DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
        doc: /* Return combination limit of window WINDOW.
+WINDOW must be a valid window used in horizontal or vertical combination.
 If the return value is nil, child windows of WINDOW can be recombined with
 WINDOW's siblings.  A return value of t means that child windows of
-WINDOW are never \(re-)combined with WINDOW's siblings.
-
-WINDOW must be a valid window.  The return value is meaningful for
-internal windows only.  */)
+WINDOW are never \(re-)combined with WINDOW's siblings.  */)
   (Lisp_Object window)
 {
+  struct window *w;
+
   CHECK_VALID_WINDOW (window);
+  w = XWINDOW (window);
+  if (!NILP (w->buffer))
+    error ("Combination limit is meaningful for internal windows only");
   return XWINDOW (window)->combination_limit;
 }
 
 DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
        doc: /* Set combination limit of window WINDOW to LIMIT; return LIMIT.
+WINDOW must be a valid window used in horizontal or vertical combination.
 If LIMIT is nil, child windows of WINDOW can be recombined with WINDOW's
 siblings.  LIMIT t means that child windows of WINDOW are never
 \(re-)combined with WINDOW's siblings.  Other values are reserved for
-future use.
-
-WINDOW must be a valid window.  Setting the combination limit is
-meaningful for internal windows only.  */)
+future use.  */)
   (Lisp_Object window, Lisp_Object limit)
 {
-  wset_combination_limit (decode_valid_window (window), limit);
+  struct window *w;
+
+  CHECK_VALID_WINDOW (window);
+  w = XWINDOW (window);
+  if (!NILP (w->buffer))
+    error ("Combination limit is meaningful for internal windows only");
+  wset_combination_limit (w, limit);
   return limit;
 }
 
@@ -5711,10 +5718,9 @@ the return value is nil.  Otherwise the value is t.  */)
                 }
             }
 
-          /* If we squirreled away the buffer in the window's height,
-             restore it now.  */
-          if (BUFFERP (w->total_lines))
-            wset_buffer (w, w->total_lines);
+          /* If we squirreled away the buffer, restore it now.  */
+          if (BUFFERP (w->combination_limit))
+            wset_buffer (w, w->combination_limit);
           wset_left_col (w, p->left_col);
           wset_top_line (w, p->top_line);
           wset_total_cols (w, p->total_cols);
@@ -5918,9 +5924,6 @@ delete_all_child_windows (Lisp_Object window)
     /* Delete WINDOW's siblings (we traverse postorderly).  */
     delete_all_child_windows (w->next);
 
-  /* See Fset_window_configuration for excuse.  */
-  wset_total_lines (w, w->buffer);
-
   if (!NILP (w->vchild))
     {
       delete_all_child_windows (w->vchild);
@@ -5936,6 +5939,10 @@ delete_all_child_windows (Lisp_Object window)
       unshow_buffer (w);
       unchain_marker (XMARKER (w->pointm));
       unchain_marker (XMARKER (w->start));
+      /* Since combination limit makes sense for an internal windows
+         only, we use this slot to save the buffer for the sake of
+         possible resurrection in Fset_window_configuration.  */
+      wset_combination_limit (w, w->buffer);
       wset_buffer (w, Qnil);
     }
 
diff --git a/src/xfaces.c b/src/xfaces.c
index 71709446c1d..28bccd392dc 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -112,7 +112,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    merging faces of that character, that face is `realized'.  The
    realization process maps face attributes to what is physically
    available on the system where Emacs runs.  The result is a
-   `realized face' in form of a struct face which is stored in the
+   `realized face' in the form of a struct face which is stored in the
    face cache of the frame on which it was realized.
 
    Face realization is done in the context of the character to display