Now on revision 112090. ------------------------------------------------------------ revno: 112090 fixes bug: http://debbugs.gnu.org/13817 committer: Dmitry Gutov branch nick: trunk timestamp: Tue 2013-03-19 09:06:49 +0400 message: * lisp/whitespace.el (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'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-19 04:23:36 +0000 +++ lisp/ChangeLog 2013-03-19 05:06:49 +0000 @@ -2,6 +2,10 @@ * 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 === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2013-03-19 04:23:36 +0000 +++ lisp/whitespace.el 2013-03-19 05:06:49 +0000 @@ -1868,7 +1868,7 @@ "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 @@ -2158,9 +2158,7 @@ "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))) + (setq whitespace-font-lock t)) ;; save current point and refontify when necessary (set (make-local-variable 'whitespace-point) (point)) @@ -2179,8 +2177,8 @@ 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. @@ -2257,8 +2255,8 @@ ((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) + 1 whitespace-space-after-tab t))))) + (font-lock-add-keywords nil whitespace-font-lock-keywords t) ;; Now turn on font lock and highlight blanks. (font-lock-mode 1))) @@ -2271,8 +2269,8 @@ (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)) + (setq whitespace-font-lock nil)) + (font-lock-remove-keywords nil whitespace-font-lock-keywords) ;; restore original font lock state (font-lock-mode whitespace-font-lock-mode))) ------------------------------------------------------------ revno: 112089 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-03-18 21:41:53 -0700 message: Spelling fixes. diff: === modified file 'lisp/international/ja-dic-cnv.el' --- lisp/international/ja-dic-cnv.el 2013-03-18 04:30:20 +0000 +++ lisp/international/ja-dic-cnv.el 2013-03-19 04:41:53 +0000 @@ -330,7 +330,7 @@ (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 === modified file 'src/alloc.c' --- src/alloc.c 2013-03-13 07:27:34 +0000 +++ src/alloc.c 2013-03-19 04:41:53 +0000 @@ -1162,7 +1162,7 @@ #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 === modified file 'src/coding.c' --- src/coding.c 2013-03-15 20:03:31 +0000 +++ src/coding.c 2013-03-19 04:41:53 +0000 @@ -6075,7 +6075,7 @@ 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 === modified file 'src/dispextern.h' --- src/dispextern.h 2013-03-17 14:34:18 +0000 +++ src/dispextern.h 2013-03-19 04:41:53 +0000 @@ -602,8 +602,8 @@ 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 === modified file 'src/image.c' --- src/image.c 2013-03-17 14:34:18 +0000 +++ src/image.c 2013-03-19 04:41:53 +0000 @@ -154,15 +154,15 @@ 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) { === modified file 'src/xfaces.c' --- src/xfaces.c 2013-02-15 12:26:42 +0000 +++ src/xfaces.c 2013-03-19 04:41:53 +0000 @@ -112,7 +112,7 @@ 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 ------------------------------------------------------------ revno: 112088 fixes bug: http://debbugs.gnu.org/13875 committer: Dmitry Gutov branch nick: trunk timestamp: Tue 2013-03-19 08:23:36 +0400 message: * lisp/whitespace.el (whitespace-color-on): Use `prepend' OVERRIDE value for `whitespace-line' face. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-19 00:16:14 +0000 +++ lisp/ChangeLog 2013-03-19 04:23:36 +0000 @@ -1,3 +1,8 @@ +2013-03-19 Dmitry Gutov + + * whitespace.el (whitespace-color-on): Use `prepend' OVERRIDE + value for `whitespace-line' face (Bug#13875). + 2013-03-19 Leo Liu * progmodes/compile.el (compilation-display-error): New command. === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2013-03-18 01:50:32 +0000 +++ lisp/whitespace.el 2013-03-19 04:23:36 +0000 @@ -2209,7 +2209,7 @@ ,(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)) ------------------------------------------------------------ revno: 112087 fixes bug: http://debbugs.gnu.org/13992 committer: Leo Liu branch nick: trunk timestamp: Tue 2013-03-19 08:16:14 +0800 message: * progmodes/compile.el (compilation-display-error): New command. (compilation-mode-map, compilation-minor-mode-map): Bind it to C-o. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-18 19:44:15 +0000 +++ lisp/ChangeLog 2013-03-19 00:16:14 +0000 @@ -1,3 +1,9 @@ +2013-03-19 Leo Liu + + * progmodes/compile.el (compilation-display-error): New command. + (compilation-mode-map, compilation-minor-mode-map): Bind it to + C-o. (Bug#13992) + 2013-03-18 Paul Eggert * term/x-win.el (x-keysym-pair): Add a Fixme (Bug#13936). === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2013-02-13 04:31:09 +0000 +++ lisp/progmodes/compile.el 2013-03-19 00:16:14 +0000 @@ -1814,6 +1814,7 @@ (define-key map [follow-link] 'mouse-face) (define-key map "\C-c\C-c" 'compile-goto-error) (define-key map "\C-m" 'compile-goto-error) + (define-key map "\C-o" 'compilation-display-error) (define-key map "\C-c\C-k" 'kill-compilation) (define-key map "\M-n" 'compilation-next-error) (define-key map "\M-p" 'compilation-previous-error) @@ -1858,6 +1859,7 @@ (define-key map [follow-link] 'mouse-face) (define-key map "\C-c\C-c" 'compile-goto-error) (define-key map "\C-m" 'compile-goto-error) + (define-key map "\C-o" 'compilation-display-error) (define-key map "\C-c\C-k" 'kill-compilation) (define-key map "\M-n" 'compilation-next-error) (define-key map "\M-p" 'compilation-previous-error) @@ -2299,6 +2301,12 @@ (interactive "p") (compilation-next-file (- n))) +(defun compilation-display-error () + "Display the source for current error in another window." + (interactive) + (setq compilation-current-error (point)) + (next-error-no-select 0)) + (defun kill-compilation () "Kill the process made by the \\[compile] or \\[grep] commands." (interactive) ------------------------------------------------------------ revno: 112086 fixes bug: http://debbugs.gnu.org/13962 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-03-18 14:02:34 -0700 message: Fix bug when building Emacs with a GNU Make submake. * Makefile.in (QUIET_SUBMAKE): New macro. (install-info, uninstall): Use it. diff: === modified file 'ChangeLog' --- ChangeLog 2013-03-18 05:26:56 +0000 +++ ChangeLog 2013-03-18 21:02:34 +0000 @@ -1,5 +1,9 @@ 2013-03-18 Paul Eggert + Fix bug when building Emacs with a GNU Make submake (Bug#13962). + * Makefile.in (QUIET_SUBMAKE): New macro. + (install-info, uninstall): Use it. + Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867). * configure.ac (IMAGEMAGICK_MODULE): Reject 6.8.2. We want to reject 6.8.2-3 through 6.8.3-9, but there seems to be === modified file 'Makefile.in' --- Makefile.in 2013-03-05 03:59:35 +0000 +++ Makefile.in 2013-03-18 21:02:34 +0000 @@ -67,6 +67,10 @@ # If Make doesn't predefine MAKE, set it here. @SET_MAKE@ +# Prevent submakes from outputting "Entering directory ..." and +# "Leaving directory..." diagnostics that would mess up 'make echo-info'. +QUIET_SUBMAKE = MAKELEVEL=0 + # ==================== Things `configure' Might Edit ==================== cache_file = @cache_file@ @@ -609,7 +613,9 @@ [ -f dir ] || \ (cd $${thisdir}; \ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \ - info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \ + info_misc=`cd $${thisdir}/doc/misc && \ + $(QUIET_SUBMAKE) $(MAKE) -s echo-info \ + `; \ cd ${srcdir}/info ; \ for elt in ${INFO_NONMISC} $${info_misc}; do \ test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ @@ -702,7 +708,7 @@ done -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} thisdir=`/bin/pwd`; \ - (info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \ + (info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \ if cd $(DESTDIR)${infodir}; then \ for elt in ${INFO_NONMISC} $${info_misc}; do \ (cd $${thisdir}; \ ------------------------------------------------------------ revno: 112085 fixes bug: http://debbugs.gnu.org/13936 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-03-18 12:44:15 -0700 message: iso-2022-7bit commentary fixes * notes/unicode: Mention some more iso-2022-7bit files. * lisp/term/x-win.el (x-keysym-pair): Add a Fixme. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-03-18 06:03:14 +0000 +++ admin/ChangeLog 2013-03-18 19:44:15 +0000 @@ -1,5 +1,7 @@ 2013-03-18 Paul Eggert + * notes/unicode: Mention some more iso-2022-7bit files (Bug#13936). + Automate the build of ja-dic.el (Bug#13984). * notes/unicode: ja-dic.el is now UTF-8. === modified file 'admin/notes/unicode' --- admin/notes/unicode 2013-03-18 06:03:14 +0000 +++ admin/notes/unicode 2013-03-18 19:44:15 +0000 @@ -190,11 +190,35 @@ * iso-2022-7bit - This file contains significant charset information, which is not - encoded in UTF-8. + This file switches between CJK charsets, which is not encoded in UTF-8. etc/HELLO + Each of these files contains just one CJK charset, but Emacs + currently has no easy way to specify set-charset-priority on a + per-file basis, so converting any of these files to UTF-8 might + change the file's appearance when viewed by an Emacs that is + operating in some other language environment. + + etc/tutorials/TUTORIAL.ja + etc/tutorials/TUTORIAL.ko + leim/quail/cyril-jis.el + leim/quail/hanja-jis.el + leim/quail/hanja.el + leim/quail/hanja3.el + leim/quail/japanese.el + leim/quail/py-punct.el + leim/quail/pypunct-b5.el + leim/quail/symbol-ksc.el + lisp/international/ja-dic-cnv.el + lisp/international/ja-dic-utl.el + lisp/international/kinsoku.el + lisp/international/kkc.el + lisp/international/titdic-cnv.el + lisp/language/japan-util.el + lisp/language/japanese.el + lisp/term/x-win.el + These files contain characters that cannot be encoded in UTF-8. leim/quail/tibetan.el === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-18 17:19:24 +0000 +++ lisp/ChangeLog 2013-03-18 19:44:15 +0000 @@ -1,3 +1,7 @@ +2013-03-18 Paul Eggert + + * term/x-win.el (x-keysym-pair): Add a Fixme (Bug#13936). + 2013-03-18 Jan Djärv * mouse.el (mouse-on-link-p): Check for scroll bar (Bug#13979). === modified file 'lisp/term/x-win.el' --- lisp/term/x-win.el 2013-01-01 09:11:05 +0000 +++ lisp/term/x-win.el 2013-03-18 19:44:15 +0000 @@ -427,7 +427,9 @@ (#x3fe . ?,D~(B) ;; Kana: Fixme: needs conversion to Japanese charset -- seems ;; to require jisx0213, for which the Unicode translation - ;; isn't clear. + ;; isn't clear. Using Emacs to convert this to Unicode and back changes + ;; this from "(J~(B" (i.e., bytes "ESC ( J ~ ESC ( B") to "$(G"#(B" (i.e., bytes + ;; "ESC $ ( G " # ESC ( B"). (#x47e . ?(J~(B) (#x4a1 . ?$A!#(B) (#x4a2 . ?\$A!8(B) @@ -1127,6 +1129,9 @@ (#x20a8 . ?$,1tH(B) (#x20aa . ?$,1tJ(B) (#x20ab . ?$,1tK(B) + ;; Kana: Fixme: needs checking. Using Emacs to convert this to Unicode + ;; and back changes this from ",b$(B" (i.e., bytes "ESC , b $ ESC ( B") to + ;; ",F$(B" (i.e., bytes "ESC , F $ ESC ( B"). (#x20ac . ?,b$(B))) (puthash (car pair) (cdr pair) x-keysym-table)) ------------------------------------------------------------ revno: 112084 fixes bug: http://debbugs.gnu.org/13984 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2013-03-18 20:56:27 +0200 message: MS-Windows followup to automation of ja-dic.el in revision 112072. leim/makefile.w32-in ($(srcdir)/ja-dic/ja-dic.el): New target. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2013-03-18 04:30:20 +0000 +++ leim/ChangeLog 2013-03-18 18:56:27 +0000 @@ -1,3 +1,7 @@ +2013-03-18 Eli Zaretskii + + * makefile.w32-in ($(srcdir)/ja-dic/ja-dic.el): New target. + 2013-03-18 Paul Eggert Automate the build of ja-dic.el (Bug#13984). === modified file 'leim/makefile.w32-in' --- leim/makefile.w32-in 2013-01-01 09:11:05 +0000 +++ leim/makefile.w32-in 2013-03-18 18:56:27 +0000 @@ -189,6 +189,13 @@ $(ARGQUOTE)$(buildlisppath)/international/quail$(ARGQUOTE) \ -f batch-byte-compile $(MISC_DIC:.elc=.el) +# Rule to generate ja-dic/ja-dic.el from SKK-DIC/SKK-JISYO.L. +$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L + - mkdir ja-dic + $(RUN_EMACS) -l \ + $(ARGQUOTE)$(buildlisppath)/international/ja-dic-cnv$(ARGQUOTE) \ + -f batch-skkdic-convert -dir ja-dic $(srcdir)/SKK-DIC/SKK-JISYO.L + # # WARNING: Do NOT split the parts inside $(ARGQUOTE)s into multiple lines as # this can break with GNU Make 3.81 and later if sh.exe is used. ------------------------------------------------------------ revno: 112083 committer: Sam Steingold branch nick: trunk timestamp: Mon 2013-03-18 13:25:15 -0400 message: * lisp/gnus/message.el (message-bury): Minor cleanup. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-03-11 16:31:55 +0000 +++ lisp/gnus/ChangeLog 2013-03-18 17:25:15 +0000 @@ -1,3 +1,7 @@ +2013-03-18 Sam Steingold + + * message.el (message-bury): Minor cleanup. + 2013-03-06 Katsumi Yamaoka * nndir.el (nndir-request-list): Remove 2nd argument passed to === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2013-03-05 17:13:01 +0000 +++ lisp/gnus/message.el 2013-03-18 17:25:15 +0000 @@ -4097,11 +4097,9 @@ (defun message-bury (buffer) "Bury this mail BUFFER." - (if message-return-action - (progn - (bury-buffer buffer) - (apply (car message-return-action) (cdr message-return-action))) - (with-current-buffer buffer (bury-buffer)))) + (bury-buffer buffer) + (when message-return-action + (apply (car message-return-action) (cdr message-return-action)))) (defun message-send (&optional arg) "Send the message in the current buffer. ------------------------------------------------------------ revno: 112082 fixes bug: http://debbugs.gnu.org/13979 committer: Jan D. branch nick: trunk timestamp: Mon 2013-03-18 18:19:24 +0100 message: * mouse.el (mouse-on-link-p): Check for scroll bar. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-18 13:04:13 +0000 +++ lisp/ChangeLog 2013-03-18 17:19:24 +0000 @@ -1,3 +1,7 @@ +2013-03-18 Jan Djärv + + * mouse.el (mouse-on-link-p): Check for scroll bar (Bug#13979). + 2013-03-18 Michael Albinus * net/tramp-compat.el (tramp-compat-user-error): New defun. === modified file 'lisp/mouse.el' --- lisp/mouse.el 2013-03-09 17:14:24 +0000 +++ lisp/mouse.el 2013-03-18 17:19:24 +0000 @@ -755,7 +755,8 @@ - Otherwise, the mouse-1 event is translated into a mouse-2 event at the same position." (let ((action - (and (or (not (consp pos)) + (and (not (memq 'vertical-scroll-bar pos)) + (or (not (consp pos)) mouse-1-click-in-non-selected-windows (eq (selected-window) (posn-window pos))) (or (mouse-posn-property pos 'follow-link) ------------------------------------------------------------ revno: 112081 fixes bug: http://debbugs.gnu.org/13867 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-03-18 09:41:24 -0700 message: * PROBLEMS: Fix previous change: any kind of transparency can crash. diff: === modified file 'etc/PROBLEMS' --- etc/PROBLEMS 2013-03-18 05:26:56 +0000 +++ etc/PROBLEMS 2013-03-18 16:41:24 +0000 @@ -206,7 +206,7 @@ If your tar has this problem, install GNU tar--if you can manage to untar it :-). -** Emacs crashes when displaying PNG images with simple (tRNS) transparency. +** Emacs can crash when displaying PNG images with transparency. This is due to a bug introduced in ImageMagick 6.8.2-3. The bug should be fixed in ImageMagick 6.8.3-10. Please see Bug#13867. ------------------------------------------------------------ revno: 112080 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2013-03-18 17:21:12 +0400 message: * window.c (window_resize_check, window_resize_apply) (window_from_coordinates, recombine_windows, set_window_buffer) (make_parent_window, Fwindow_resize_apply, resize_frame_windows) (Fsplit_window_internal, Fdelete_window_internal) (freeze_window_starts): Use bool for booleans. * window.h (window_frame_coordinates, resize_frame_windows) (freeze_window_starts, set_window_buffer): Adjust prototypes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-17 22:49:50 +0000 +++ src/ChangeLog 2013-03-18 13:21:12 +0000 @@ -1,3 +1,13 @@ +2013-03-18 Dmitry Antipov + + * window.c (window_resize_check, window_resize_apply) + (window_from_coordinates, recombine_windows, set_window_buffer) + (make_parent_window, Fwindow_resize_apply, resize_frame_windows) + (Fsplit_window_internal, Fdelete_window_internal) + (freeze_window_starts): Use bool for booleans. + * window.h (window_frame_coordinates, resize_frame_windows) + (freeze_window_starts, set_window_buffer): Adjust prototypes. + 2013-03-17 Stefan Monnier * dispnew.c (bitch_at_user): Use `user-error'. === modified file 'src/window.c' --- src/window.c 2013-03-13 15:41:54 +0000 +++ src/window.c 2013-03-18 13:21:12 +0000 @@ -84,8 +84,8 @@ int (* fn) (struct window *, void *), void *); static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object); -static int window_resize_check (struct window *, int); -static void window_resize_apply (struct window *, int); +static int window_resize_check (struct window *, bool); +static void window_resize_apply (struct window *, bool); static Lisp_Object select_window (Lisp_Object, Lisp_Object, int); static void select_window_1 (Lisp_Object, bool); @@ -1368,7 +1368,7 @@ Lisp_Object window_from_coordinates (struct frame *f, int x, int y, - enum window_part *part, int tool_bar_p) + enum window_part *part, bool tool_bar_p) { Lisp_Object window; struct check_window_data cw; @@ -2055,7 +2055,7 @@ { struct window *w, *p, *c; Lisp_Object parent, child; - int horflag; + bool horflag; w = XWINDOW (window); parent = w->parent; @@ -3148,7 +3148,8 @@ reset from the buffer's local settings. */ void -set_window_buffer (Lisp_Object window, Lisp_Object buffer, int run_hooks_p, int keep_margins_p) +set_window_buffer (Lisp_Object window, Lisp_Object buffer, + bool run_hooks_p, bool keep_margins_p) { struct window *w = XWINDOW (window); struct buffer *b = XBUFFER (buffer); @@ -3406,7 +3407,7 @@ WINDOW its only vertical child (HORFLAG 1 means make WINDOW its only horizontal child). */ static void -make_parent_window (Lisp_Object window, int horflag) +make_parent_window (Lisp_Object window, bool horflag) { Lisp_Object parent; register struct window *o, *p; @@ -3519,7 +3520,7 @@ `window-min-height' or `window-min-width'. It does check that window sizes do not drop below one line (two columns). */ static int -window_resize_check (struct window *w, int horflag) +window_resize_check (struct window *w, bool horflag) { struct window *c; @@ -3600,7 +3601,7 @@ This function does not perform any error checks. Make sure you have run window_resize_check on W before applying this function. */ static void -window_resize_apply (struct window *w, int horflag) +window_resize_apply (struct window *w, bool horflag) { struct window *c; int pos; @@ -3681,7 +3682,7 @@ { struct frame *f = decode_live_frame (frame); struct window *r = XWINDOW (FRAME_ROOT_WINDOW (f)); - int horflag = !NILP (horizontal); + bool horflag = !NILP (horizontal); if (!window_resize_check (r, horflag) || ! EQ (r->new_total, @@ -3711,7 +3712,7 @@ satisfy the request. The result will be meaningful if and only if F's windows have meaningful sizes when you call this. */ void -resize_frame_windows (struct frame *f, int size, int horflag) +resize_frame_windows (struct frame *f, int size, bool horflag) { Lisp_Object root = f->root_window; struct window *r = XWINDOW (root); @@ -3825,7 +3826,7 @@ register Lisp_Object new, frame, reference; register struct window *o, *p, *n, *r; struct frame *f; - int horflag + bool horflag /* HORFLAG is 1 when we split side-by-side, 0 otherwise. */ = EQ (side, Qt) || EQ (side, Qleft) || EQ (side, Qright); int combination_limit = 0; @@ -3994,7 +3995,7 @@ register Lisp_Object parent, sibling, frame, root; struct window *w, *p, *s, *r; struct frame *f; - int horflag; + bool horflag; int before_sibling = 0; w = decode_any_window (window); @@ -6527,7 +6528,7 @@ means freeze the window start. */ void -freeze_window_starts (struct frame *f, int freeze_p) +freeze_window_starts (struct frame *f, bool freeze_p) { foreach_window (f, freeze_window_start, (void *) (freeze_p ? f : 0)); } === modified file 'src/window.h' --- src/window.h 2013-02-12 16:36:55 +0000 +++ src/window.h 2013-03-18 13:21:12 +0000 @@ -891,10 +891,10 @@ extern Lisp_Object make_window (void); extern Lisp_Object window_from_coordinates (struct frame *, int, int, - enum window_part *, int); -extern void resize_frame_windows (struct frame *, int, int); + enum window_part *, bool); +extern void resize_frame_windows (struct frame *, int, bool); extern void delete_all_child_windows (Lisp_Object); -extern void freeze_window_starts (struct frame *, int); +extern void freeze_window_starts (struct frame *, bool); extern void grow_mini_window (struct window *, int); extern void shrink_mini_window (struct window *); extern int window_relative_x_coord (struct window *, enum window_part, int); @@ -906,7 +906,7 @@ it's not allowed. */ void set_window_buffer (Lisp_Object window, Lisp_Object buffer, - int run_hooks_p, int keep_margins_p); + bool run_hooks_p, bool keep_margins_p); /* This is the window where the echo area message was displayed. It is always a minibuffer window, but it may not be the same window ------------------------------------------------------------ revno: 112079 committer: Michael Albinus + + * tramp.texi (Filename Syntax): Host names are not allowed to be + any method name, unless method name is specified explicitly. + Remove restriction on unibyte filenames. + + * trampver.texi: Update release number. + 2013-03-17 Paul Eggert doc: convert some TeX accents to UTF-8 === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2013-03-03 11:47:20 +0000 +++ doc/misc/tramp.texi 2013-03-18 13:07:16 +0000 @@ -2406,13 +2406,18 @@ @file{.emacs} in my home directory I would specify the filename @file{@trampfn{ssh, daniel, melancholia, .emacs}}. +@ifset emacs +A remote filename containing a host name only, which is equal to a +method name, is not allowed. If such a host name is used, it must +always be preceded by an explicit method name, like +@file{@value{prefix}ssh@value{postfixhop}ssh@value{postfix}}. +@end ifset + Finally, for some methods it is possible to specify a different port number than the default one, given by the method. This is specified by adding @file{#} to the host name, like in @file{@trampfn{ssh, daniel, melancholia#42, .emacs}}. -Note that @value{tramp} supports only filenames encoded in unibyte. - @node Alternative Syntax @section URL-like filename syntax === modified file 'doc/misc/trampver.texi' --- doc/misc/trampver.texi 2013-03-15 14:19:06 +0000 +++ doc/misc/trampver.texi 2013-03-18 13:07:16 +0000 @@ -8,7 +8,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.2.7 +@set trampver 2.2.8-pre @c Other flags from configuration @set instprefix /usr/local ------------------------------------------------------------ revno: 112078 committer: Michael Albinus + + * net/tramp-compat.el (tramp-compat-user-error): New defun. + + * net/tramp-adb.el (tramp-adb-handle-shell-command): + * net/tramp-gvfs.el (top): + * net/tramp.el (tramp-find-method, tramp-dissect-file-name) + (tramp-handle-shell-command): Use it. + (tramp-dissect-file-name): Raise an error when hostname is a + method name, and neither method nor user is specified. + + * net/trampver.el: Update release number. + 2013-03-18 Leo Liu Make sure eldoc can be turned off properly. === modified file 'lisp/net/tramp-adb.el' --- lisp/net/tramp-adb.el 2013-03-17 17:23:05 +0000 +++ lisp/net/tramp-adb.el 2013-03-18 13:04:13 +0000 @@ -856,7 +856,7 @@ (when p (if (yes-or-no-p "A command is running. Kill it? ") (ignore-errors (kill-process p)) - (error "Shell command in progress"))) + (tramp-compat-user-error "Shell command in progress"))) (if current-buffer-p (progn === modified file 'lisp/net/tramp-compat.el' --- lisp/net/tramp-compat.el 2013-03-05 15:55:53 +0000 +++ lisp/net/tramp-compat.el 2013-03-18 13:04:13 +0000 @@ -533,6 +533,11 @@ "`dos', `unix', or `mac'"))))) (t (error "Can't change EOL conversion -- is MULE missing?")))) +;; `user-error' has been added to Emacs 24.3. +(defun tramp-compat-user-error (format &rest args) + "Signal a pilot error." + (apply (if (fboundp 'user-error) 'user-error 'error) format args)) + (add-hook 'tramp-unload-hook (lambda () (unload-feature 'tramp-compat 'force))) === modified file 'lisp/net/tramp-gvfs.el' --- lisp/net/tramp-gvfs.el 2013-03-09 11:06:23 +0000 +++ lisp/net/tramp-gvfs.el 2013-03-18 13:04:13 +0000 @@ -153,7 +153,7 @@ (unless (and (tramp-compat-funcall 'dbus-get-unique-name :session) (or (tramp-compat-process-running-p "gvfs-fuse-daemon") (tramp-compat-process-running-p "gvfsd-fuse"))) - (error "Package `tramp-gvfs' not supported")) + (tramp-compat-user-error "Package `tramp-gvfs' not supported")) (defconst tramp-gvfs-path-mounttracker "/org/gtk/vfs/mounttracker" "The object path of the GVFS daemon.") === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2013-03-09 11:06:23 +0000 +++ lisp/net/tramp.el 2013-03-18 13:04:13 +0000 @@ -1203,7 +1203,7 @@ result (substring result 0 -1)) (unless (y-or-n-p (format "Method %s is obsolete, use %s? " result (substring result 0 -1))) - (error 'file-error "Method \"%s\" not supported" result))) + (tramp-compat-user-error "Method \"%s\" not supported" result))) (add-to-list 'tramp-warned-obsolete-methods result)) ;; This works with the current set of `tramp-obsolete-methods'. ;; Must be improved, if their are more sophisticated replacements. @@ -1249,7 +1249,7 @@ values." (save-match-data (let ((match (string-match (nth 0 tramp-file-name-structure) name))) - (unless match (error "Not a Tramp file name: %s" name)) + (unless match (tramp-compat-user-error "Not a Tramp file name: %s" name)) (let ((method (match-string (nth 1 tramp-file-name-structure) name)) (user (match-string (nth 2 tramp-file-name-structure) name)) (host (match-string (nth 3 tramp-file-name-structure) name)) @@ -1259,7 +1259,12 @@ (when (string-match tramp-prefix-ipv6-regexp host) (setq host (replace-match "" nil t host))) (when (string-match tramp-postfix-ipv6-regexp host) - (setq host (replace-match "" nil t host)))) + (setq host (replace-match "" nil t host))) + (when (and (equal tramp-syntax 'ftp) (null method) (null user) + (member host (mapcar 'car tramp-methods)) + (not (tramp-completion-mode-p))) + (tramp-compat-user-error + "Host name must not match method `%s'" host))) (if nodefault (vector method user host localname hop) (vector @@ -3179,7 +3184,7 @@ (when p (if (yes-or-no-p "A command is running. Kill it? ") (ignore-errors (kill-process p)) - (error "Shell command in progress"))) + (tramp-compat-user-error "Shell command in progress"))) (if current-buffer-p (progn === modified file 'lisp/net/trampver.el' --- lisp/net/trampver.el 2013-03-15 14:17:25 +0000 +++ lisp/net/trampver.el 2013-03-18 13:04:13 +0000 @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.7" +(defconst tramp-version "2.2.8-pre" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.7 is not fit for %s" + (format "Tramp 2.2.8-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) ------------------------------------------------------------ revno: 112077 committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-03-18 06:17:40 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2013-03-14 10:17:38 +0000 +++ autogen/configure 2013-03-18 10:17:40 +0000 @@ -10785,7 +10785,8 @@ ## 6.2.8 is the earliest version known to work, but earlier versions ## might work - let us know if you find one. ## 6.0.7 does not work. See bug#7955. - IMAGEMAGICK_MODULE="Wand >= 6.2.8" + ## 6.8.2 makes Emacs crash; see Bug#13867. + IMAGEMAGICK_MODULE="Wand >= 6.2.8 Wand != 6.8.2" succeeded=no ------------------------------------------------------------ revno: 112076 committer: Leo Liu branch nick: trunk timestamp: Mon 2013-03-18 17:16:15 +0800 message: Make sure eldoc can be turned off properly. * emacs-lisp/eldoc.el (eldoc-schedule-timer): Conditionalize on eldoc-mode. (eldoc-display-message-p): Revert last change. (eldoc-display-message-no-interference-p) (eldoc-print-current-symbol-info): Tweak. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-18 07:41:38 +0000 +++ lisp/ChangeLog 2013-03-18 09:16:15 +0000 @@ -1,3 +1,12 @@ +2013-03-18 Leo Liu + + Make sure eldoc can be turned off properly. + * emacs-lisp/eldoc.el (eldoc-schedule-timer): Conditionalize on + eldoc-mode. + (eldoc-display-message-p): Revert last change. + (eldoc-display-message-no-interference-p) + (eldoc-print-current-symbol-info): Tweak. + 2013-03-18 Tassilo Horn * doc-view.el (doc-view-new-window-function): Check the new window === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2013-03-17 15:00:37 +0000 +++ lisp/emacs-lisp/eldoc.el 2013-03-18 09:16:15 +0000 @@ -198,8 +198,9 @@ (or (and eldoc-timer (memq eldoc-timer timer-idle-list)) (setq eldoc-timer - (run-with-idle-timer eldoc-idle-delay t - 'eldoc-print-current-symbol-info))) + (run-with-idle-timer + eldoc-idle-delay t + (lambda () (and eldoc-mode (eldoc-print-current-symbol-info)))))) ;; If user has changed the idle delay, update the timer. (cond ((not (= eldoc-idle-delay eldoc-current-idle-delay)) @@ -272,21 +273,19 @@ ;; Decide whether now is a good time to display a message. (defun eldoc-display-message-p () (and (eldoc-display-message-no-interference-p) - ;; `eldoc-post-insert-mode' uses no timers. - (or (not eldoc-mode) - ;; If this-command is non-nil while running via an idle - ;; timer, we're still in the middle of executing a command, - ;; e.g. a query-replace where it would be annoying to - ;; overwrite the echo area. - (and (not this-command) - (symbolp last-command) - (intern-soft (symbol-name last-command) - eldoc-message-commands))))) + ;; If this-command is non-nil while running via an idle + ;; timer, we're still in the middle of executing a command, + ;; e.g. a query-replace where it would be annoying to + ;; overwrite the echo area. + (and (not this-command) + (symbolp last-command) + (intern-soft (symbol-name last-command) + eldoc-message-commands)))) ;; Check various conditions about the current environment that might make ;; it undesirable to print eldoc messages right this instant. (defun eldoc-display-message-no-interference-p () - (and (or eldoc-mode eldoc-post-insert-mode) + (and eldoc-mode (not executing-kbd-macro) (not (and (boundp 'edebug-active) edebug-active)))) @@ -310,7 +309,7 @@ (defun eldoc-print-current-symbol-info () (condition-case err - (and (eldoc-display-message-p) + (and (or (eldoc-display-message-p) eldoc-post-insert-mode) (if eldoc-documentation-function (eldoc-message (funcall eldoc-documentation-function)) (let* ((current-symbol (eldoc-current-symbol)) ------------------------------------------------------------ revno: 112075 committer: Tassilo Horn branch nick: trunk timestamp: Mon 2013-03-18 08:41:38 +0100 message: * doc-view.el (doc-view-new-window-function): Check the new window overlay's display property instead the char property of the buffer's first char. Use `with-selected-window' instead of `save-window-excursion' with `select-window'. (doc-view-document->bitmap): Check the current doc-view overlay's display property instead the char property of the buffer's first char. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-18 04:30:20 +0000 +++ lisp/ChangeLog 2013-03-18 07:41:38 +0000 @@ -1,3 +1,13 @@ +2013-03-18 Tassilo Horn + + * doc-view.el (doc-view-new-window-function): Check the new window + overlay's display property instead the char property of the + buffer's first char. Use `with-selected-window' instead of + `save-window-excursion' with `select-window'. + (doc-view-document->bitmap): Check the current doc-view overlay's + display property instead the char property of the buffer's first + char. + 2013-03-18 Paul Eggert Automate the build of ja-dic.el (Bug#13984). === modified file 'lisp/doc-view.el' --- lisp/doc-view.el 2013-03-14 21:33:07 +0000 +++ lisp/doc-view.el 2013-03-18 07:41:38 +0000 @@ -326,7 +326,7 @@ (delete-overlay ol)) (image-mode-window-put 'overlay ol winprops) (when (windowp (car winprops)) - (if (stringp (get-char-property (point-min) 'display)) + (if (stringp (overlay-get ol 'display)) ;; We're not already displaying an image, so this is the ;; initial window showing the document. (run-with-timer nil nil @@ -338,12 +338,11 @@ (with-selected-window (car winprops) (doc-view-goto-page 1))))) ;; We've split the window showing the document. All we need - ;; to do is selecting the new window to make the image appear - ;; there, too. + ;; to do is selecting the new window to cause a redisplay to + ;; make the image appear there, too. (run-with-timer nil nil (lambda () - (save-window-excursion - (select-window (car winprops))))))))) + (with-selected-window (car winprops)))))))) (defvar doc-view-current-files nil "Only used internally.") @@ -1026,7 +1025,7 @@ ;; not sufficient. (dolist (win (get-buffer-window-list (current-buffer) nil 'visible)) (with-selected-window win - (when (stringp (get-char-property (point-min) 'display)) + (when (stringp (overlay-get (doc-view-current-overlay) 'display)) (doc-view-goto-page (doc-view-current-page))))) ;; Convert the rest of the pages. (doc-view-pdf/ps->png pdf png))))))) ------------------------------------------------------------ revno: 112074 fixes bug: http://debbugs.gnu.org/13984 committer: Paul Eggert branch nick: trunk timestamp: Sun 2013-03-17 23:03:14 -0700 message: * notes/unicode: ja-dic.el is now UTF-8. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-03-16 22:08:22 +0000 +++ admin/ChangeLog 2013-03-18 06:03:14 +0000 @@ -1,3 +1,8 @@ +2013-03-18 Paul Eggert + + Automate the build of ja-dic.el (Bug#13984). + * notes/unicode: ja-dic.el is now UTF-8. + 2013-03-16 Glenn Morris * admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi. === modified file 'admin/notes/unicode' --- admin/notes/unicode 2013-03-12 23:53:35 +0000 +++ admin/notes/unicode 2013-03-18 06:03:14 +0000 @@ -170,11 +170,9 @@ * japanese-iso-8bit SKK-JISYO.L is a verbatim copy of a file taken from an external source. - ja-dic.el is generated automatically by skkdic-convert; this process - hasn't been converted to use UTF-8. + It hasn't been converted to UTF-8. leim/SKK-DIC/SKK-JISYO.L - leim/ja-dic/ja-dic.el * japanese-shift-jis