Now on revision 109852. ------------------------------------------------------------ revno: 109852 fixes bug: http://debbugs.gnu.org/12075 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-09-02 12:47:28 +0800 message: Recommand against save-window-excursion in Lisp manual. * windows.texi (Window Configurations): Recommend against using save-window-excursion. * control.texi (Catch and Throw): * positions.texi (Excursions): Don't mention it. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-09-01 01:04:26 +0000 +++ doc/lispref/ChangeLog 2012-09-02 04:47:28 +0000 @@ -1,3 +1,11 @@ +2012-09-02 Chong Yidong + + * windows.texi (Window Configurations): Recommend against using + save-window-excursion (Bug#12075). + + * control.texi (Catch and Throw): + * positions.texi (Excursions): Don't mention it. + 2012-09-01 Paul Eggert Better seed support for (random). === modified file 'doc/lispref/control.texi' --- doc/lispref/control.texi 2012-05-27 01:34:14 +0000 +++ doc/lispref/control.texi 2012-09-02 04:47:28 +0000 @@ -556,16 +556,14 @@ @code{catch} in between). Executing @code{throw} exits all Lisp constructs up to the matching -@code{catch}, including function calls. When binding constructs such as -@code{let} or function calls are exited in this way, the bindings are -unbound, just as they are when these constructs exit normally +@code{catch}, including function calls. When binding constructs such +as @code{let} or function calls are exited in this way, the bindings +are unbound, just as they are when these constructs exit normally (@pxref{Local Variables}). Likewise, @code{throw} restores the buffer and position saved by @code{save-excursion} (@pxref{Excursions}), and -the narrowing status saved by @code{save-restriction} and the window -selection saved by @code{save-window-excursion} (@pxref{Window -Configurations}). It also runs any cleanups established with the -@code{unwind-protect} special form when it exits that form -(@pxref{Cleanups}). +the narrowing status saved by @code{save-restriction}. It also runs +any cleanups established with the @code{unwind-protect} special form +when it exits that form (@pxref{Cleanups}). The @code{throw} need not appear lexically within the @code{catch} that it jumps to. It can equally well be called from another function === modified file 'doc/lispref/positions.texi' --- doc/lispref/positions.texi 2012-06-17 05:13:40 +0000 +++ doc/lispref/positions.texi 2012-09-02 04:47:28 +0000 @@ -850,9 +850,6 @@ @cindex window excursions Likewise, @code{save-excursion} does not restore window-buffer correspondences altered by functions such as @code{switch-to-buffer}. -One way to restore these correspondences, and the selected window, is to -use @code{save-window-excursion} inside @code{save-excursion} -(@pxref{Window Configurations}). @strong{Warning:} Ordinary insertion of text adjacent to the saved point value relocates the saved value, just as it relocates all === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2012-08-21 09:50:58 +0000 +++ doc/lispref/windows.texi 2012-09-02 04:47:28 +0000 @@ -3153,42 +3153,21 @@ @end defun @defmac save-window-excursion forms@dots{} -This special form records the window configuration, executes @var{forms} -in sequence, then restores the earlier window configuration. The window -configuration includes, for each window, the value of point and the -portion of the buffer that is visible. It also includes the choice of -selected window. However, it does not include the value of point in -the current buffer; use @code{save-excursion} also, if you wish to -preserve that. - -Don't use this construct when @code{save-selected-window} is sufficient. - -Exit from @code{save-window-excursion} always triggers execution of -@code{window-size-change-functions}. (It doesn't know how to tell -whether the restored configuration actually differs from the one in -effect at the end of the @var{forms}.) - -The return value is the value of the final form in @var{forms}. -For example: - -@example -@group -(split-window) - @result{} # -@end group -@group -(setq w (selected-window)) - @result{} # -@end group -@group -(save-window-excursion - (delete-other-windows w) - (switch-to-buffer "foo") - 'do-something) - @result{} do-something - ;; @r{The screen is now split again.} -@end group -@end example +This macro records the window configuration of the selected frame, +executes @var{forms} in sequence, then restores the earlier window +configuration. The return value is the value of the final form in +@var{forms}. + +Most Lisp code should not use this macro; @code{save-selected-window} +is typically sufficient. In particular, this macro cannot reliably +prevent the code in @var{forms} from opening new windows, because new +windows might be opened in other frames (@pxref{Choosing Window}), and +@code{save-window-excursion} only saves and restores the window +configuration on the current frame. + +Do not use this macro in @code{window-size-change-functions}; exiting +the macro triggers execution of @code{window-size-change-functions}, +leading to an endless loop. @end defmac @defun window-configuration-p object @@ -3424,11 +3403,11 @@ causes these functions to be called. Changing the frame size also counts, because it changes the sizes of the existing windows. -It is not a good idea to use @code{save-window-excursion} (@pxref{Window -Configurations}) in these functions, because that always counts as a -size change, and it would cause these functions to be called over and -over. In most cases, @code{save-selected-window} (@pxref{Selecting -Windows}) is what you need here. +You may use @code{save-selected-window} in these functions +(@pxref{Selecting Windows}). However, do not use +@code{save-window-excursion} (@pxref{Window Configurations}); exiting +that macro counts as a size change, which would cause these functions +to be called over and over. @end defvar @defvar window-configuration-change-hook ------------------------------------------------------------ revno: 109851 fixes bug: http://debbugs.gnu.org/11758 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-09-02 11:50:29 +0800 message: * keymap.c (push_key_description): Print M-TAB as C-M-i. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-02 02:22:33 +0000 +++ src/ChangeLog 2012-09-02 03:50:29 +0000 @@ -1,3 +1,8 @@ +2012-09-02 Chong Yidong + + * keymap.c (push_key_description): Print M-TAB as C-M-i + (Bug#11758). + 2012-09-02 Juanma Barranquero * makefile.w32-in (CCL_H, W32FONT_H): New macros. === modified file 'src/keymap.c' --- src/keymap.c 2012-08-28 06:20:08 +0000 +++ src/keymap.c 2012-09-02 03:50:29 +0000 @@ -2157,7 +2157,7 @@ char * push_key_description (EMACS_INT ch, char *p, int force_multibyte) { - int c, c2; + int c, c2, tab_as_ci; /* Clear all the meaningless bits above the meta bit. */ c = ch & (meta_modifier | ~ - meta_modifier); @@ -2171,6 +2171,8 @@ return p; } + tab_as_ci = (c2 == '\t' && (c & meta_modifier)); + if (c & alt_modifier) { *p++ = 'A'; @@ -2178,7 +2180,8 @@ c -= alt_modifier; } if ((c & ctrl_modifier) != 0 - || (c2 < ' ' && c2 != 27 && c2 != '\t' && c2 != Ctl ('M'))) + || (c2 < ' ' && c2 != 27 && c2 != '\t' && c2 != Ctl ('M')) + || tab_as_ci) { *p++ = 'C'; *p++ = '-'; @@ -2216,6 +2219,10 @@ *p++ = 'S'; *p++ = 'C'; } + else if (tab_as_ci) + { + *p++ = 'i'; + } else if (c == '\t') { *p++ = 'T'; ------------------------------------------------------------ revno: 109850 fixes bug: http://debbugs.gnu.org/11616 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-09-02 10:47:02 +0800 message: * dired.el (dired-mode-map): Menu string fixes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-02 00:56:03 +0000 +++ lisp/ChangeLog 2012-09-02 02:47:02 +0000 @@ -1,3 +1,7 @@ +2012-09-02 Chong Yidong + + * dired.el (dired-mode-map): Menu string fixes (Bug#11616). + 2012-09-02 Glenn Morris * simple.el (undo): Tweak message in undo-only case. (Bug#12283) === modified file 'lisp/dired.el' --- lisp/dired.el 2012-08-27 09:05:55 +0000 +++ lisp/dired.el 2012-09-02 02:47:02 +0000 @@ -1739,7 +1739,7 @@ (define-key map [menu-bar operate epa-dired-do-decrypt] - '(menu-item "Decrypt" epa-dired-do-decrypt + '(menu-item "Decrypt..." epa-dired-do-decrypt :help "Decrypt file at cursor")) (define-key map @@ -1749,12 +1749,12 @@ (define-key map [menu-bar operate epa-dired-do-sign] - '(menu-item "Sign" epa-dired-do-sign + '(menu-item "Sign..." epa-dired-do-sign :help "Create digital signature of file at cursor")) (define-key map [menu-bar operate epa-dired-do-encrypt] - '(menu-item "Encrypt" epa-dired-do-encrypt + '(menu-item "Encrypt..." epa-dired-do-encrypt :help "Encrypt file at cursor")) (define-key map [menu-bar operate dashes-3] ------------------------------------------------------------ revno: 109849 committer: Chong Yidong branch nick: trunk timestamp: Sun 2012-09-02 10:30:06 +0800 message: Expand on NEWS entry about deletion of `z' from special-mode-map. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-09-01 01:04:26 +0000 +++ etc/NEWS 2012-09-02 02:30:06 +0000 @@ -166,7 +166,8 @@ * Editing Changes in Emacs 24.3 ** The `z' key no longer has a binding in most special modes. -It used to kill the current buffer. +It used to be bound to `kill-this-buffer', but `z' is too easy to +accidentally type. ** New option `yank-handled-properties' allows processing of text properties on yanked text, in more ways that are more general than ------------------------------------------------------------ revno: 109848 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2012-09-02 04:22:33 +0200 message: src/makefile.w32-in: Update dependencies. (CCL_H, W32FONT_H): New macros. (ATIMER_H, FONT_H, $(BLD)/alloc.$(O), $(BLD)/callproc.$(O)) ($(BLD)/editfns.$(O), $(BLD)/ccl.$(O), $(BLD)/chartab.$(O)) ($(BLD)/coding.$(O), $(BLD)/sysdep.$(O), $(BLD)/fontset.$(O)) ($(BLD)/sysdep.$(O), $(BLD)/w32fns.$(O), $(BLD)/keyboard.$(O)) ($(BLD)/w32term.$(O), $(BLD)/w32menu.$(O), $(BLD)/process.$(O)) ($(BLD)/w32font.$(O), $(BLD)/w32uniscribe.$(O)): Update. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-01 13:54:27 +0000 +++ src/ChangeLog 2012-09-02 02:22:33 +0000 @@ -1,3 +1,13 @@ +2012-09-02 Juanma Barranquero + + * makefile.w32-in (CCL_H, W32FONT_H): New macros. + (ATIMER_H, FONT_H, $(BLD)/alloc.$(O), $(BLD)/callproc.$(O)) + ($(BLD)/editfns.$(O), $(BLD)/ccl.$(O), $(BLD)/chartab.$(O)) + ($(BLD)/coding.$(O), $(BLD)/sysdep.$(O), $(BLD)/fontset.$(O)) + ($(BLD)/sysdep.$(O), $(BLD)/w32fns.$(O), $(BLD)/keyboard.$(O)) + ($(BLD)/w32term.$(O), $(BLD)/w32menu.$(O), $(BLD)/process.$(O)) + ($(BLD)/w32font.$(O), $(BLD)/w32uniscribe.$(O)): Update dependencies. + 2012-09-01 Eli Zaretskii * w32uniscribe.c (uniscribe_shape): Handle correctly the case of === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2012-08-28 16:01:59 +0000 +++ src/makefile.w32-in 2012-09-02 02:22:33 +0000 @@ -390,6 +390,7 @@ $(NT_INC)/sys/time.h \ $(GNU_LIB)/timespec.h ATIMER_H = $(SRC)/atimer.h \ + $(NT_INC)/stdbool.h \ $(SYSTIME_H) BLOCKINPUT_H = $(SRC)/blockinput.h \ $(ATIMER_H) @@ -401,6 +402,8 @@ $(NT_INC)/unistd.h CHARACTER_H = $(SRC)/character.h \ $(GNU_LIB)/verify.h +CCL_H = $(SRC)/ccl.h \ + $(CHARACTER_H) CHARSET_H = $(SRC)/charset.h \ $(GNU_LIB)/verify.h CODING_H = $(SRC)/coding.h \ @@ -422,7 +425,7 @@ FILEMODE_H = $(GNU_LIB)/filemode.h \ $(NT_INC)/sys/stat.h FONT_H = $(SRC)/font.h \ - $(SRC)/ccl.h + $(CCL_H) FRAME_H = $(SRC)/frame.h \ $(DISPEXTERN_H) FTOASTR_H = $(GNU_LIB)/ftoastr.h \ @@ -469,6 +472,8 @@ $(NT_INC)/unistd.h TERMHOOKS_H = $(SRC)/termhooks.h \ $(SYSTIME_H) +W32FONT_H = $(SRC)/w32font.h \ + $(FONT_H) W32TERM_H = $(SRC)/w32term.h \ $(W32GUI_H) WINDOW_H = $(SRC)/window.h \ @@ -480,7 +485,6 @@ $(SRC)/syssignal.h \ $(SRC)/w32.h \ $(NT_INC)/unistd.h \ - $(GNU_LIB)/execinfo.h \ $(GNU_LIB)/verify.h \ $(BLOCKINPUT_H) \ $(BUFFER_H) \ @@ -554,7 +558,6 @@ $(BLD)/callproc.$(O) : \ $(SRC)/callproc.c \ - $(SRC)/ccl.h \ $(SRC)/commands.h \ $(SRC)/composite.h \ $(SRC)/epaths.h \ @@ -564,6 +567,7 @@ $(NT_INC)/unistd.h \ $(BLOCKINPUT_H) \ $(BUFFER_H) \ + $(CCL_H) \ $(CHARACTER_H) \ $(CODING_H) \ $(CONFIG_H) \ @@ -603,7 +607,7 @@ $(BLD)/ccl.$(O) : \ $(SRC)/ccl.c \ - $(SRC)/ccl.h \ + $(CCL_H) \ $(CHARACTER_H) \ $(CHARSET_H) \ $(CODING_H) \ @@ -635,7 +639,7 @@ $(BLD)/chartab.$(O) : \ $(SRC)/chartab.c \ - $(SRC)/ccl.h \ + $(CCL_H) \ $(CHARACTER_H) \ $(CHARSET_H) \ $(CONFIG_H) \ @@ -657,9 +661,9 @@ $(BLD)/coding.$(O) : \ $(SRC)/coding.c \ - $(SRC)/ccl.h \ $(SRC)/composite.h \ $(BUFFER_H) \ + $(CCL_H) \ $(CHARACTER_H) \ $(CHARSET_H) \ $(CODING_H) \ @@ -803,6 +807,7 @@ $(PROCESS_H) \ $(SYSTTY_H) \ $(TERMHOOKS_H) \ + $(W32TERM_H) \ $(WINDOW_H) $(BLD)/eval.$(O) : \ @@ -898,10 +903,10 @@ $(BLD)/fontset.$(O) : \ $(SRC)/fontset.c \ - $(SRC)/ccl.h \ $(SRC)/fontset.h \ $(BLOCKINPUT_H) \ $(BUFFER_H) \ + $(CCL_H) \ $(CHARACTER_H) \ $(CHARSET_H) \ $(CONFIG_H) \ @@ -1269,6 +1274,7 @@ $(SYSTIME_H) \ $(SYSTTY_H) \ $(TERMHOOKS_H) \ + $(W32TERM_H) \ $(WINDOW_H) $(BLD)/ralloc.$(O) : \ @@ -1524,14 +1530,13 @@ $(BLD)/w32fns.$(O) : \ $(SRC)/w32fns.c \ - $(SRC)/ccl.h \ $(SRC)/epaths.h \ $(SRC)/fontset.h \ $(SRC)/w32.h \ - $(SRC)/w32font.h \ $(SRC)/w32heap.h \ $(BLOCKINPUT_H) \ $(BUFFER_H) \ + $(CCL_H) \ $(CHARACTER_H) \ $(CHARSET_H) \ $(CODING_H) \ @@ -1544,6 +1549,7 @@ $(LISP_H) \ $(SYSTIME_H) \ $(TERMHOOKS_H) \ + $(W32FONT_H) \ $(W32TERM_H) \ $(WINDOW_H) @@ -1568,18 +1574,17 @@ $(BLD)/w32term.$(O) : \ $(SRC)/w32term.c \ - $(SRC)/ccl.h \ $(SRC)/disptab.h \ $(SRC)/fontset.h \ $(SRC)/keymap.h \ $(SRC)/termchar.h \ $(SRC)/termopts.h \ - $(SRC)/w32font.h \ $(SRC)/w32heap.h \ $(NT_INC)/sys/stat.h \ $(ATIMER_H) \ $(BLOCKINPUT_H) \ $(BUFFER_H) \ + $(CCL_H) \ $(CHARACTER_H) \ $(CHARSET_H) \ $(CODING_H) \ @@ -1594,6 +1599,7 @@ $(SYSTIME_H) \ $(SYSTTY_H) \ $(TERMHOOKS_H) \ + $(W32FONT_H) \ $(W32TERM_H) \ $(WINDOW_H) @@ -1629,7 +1635,6 @@ $(BLD)/w32font.$(O) : \ $(SRC)/w32font.c \ $(SRC)/fontset.h \ - $(SRC)/w32font.h \ $(CHARACTER_H) \ $(CHARSET_H) \ $(CODING_H) \ @@ -1638,13 +1643,13 @@ $(FONT_H) \ $(FRAME_H) \ $(LISP_H) \ + $(W32FONT_H) \ $(W32TERM_H) $(BLD)/w32uniscribe.$(O) : \ $(SRC)/w32uniscribe.c \ $(SRC)/composite.h \ $(SRC)/fontset.h \ - $(SRC)/w32font.h \ $(CHARACTER_H) \ $(CHARSET_H) \ $(CONFIG_H) \ @@ -1652,6 +1657,7 @@ $(FONT_H) \ $(FRAME_H) \ $(LISP_H) \ + $(W32FONT_H) \ $(W32TERM_H) # Each object file depends on stamp_BLD, because in parallel builds we must ------------------------------------------------------------ revno: 109847 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2012-09-02 04:00:47 +0200 message: nt/config.nt: Sync with autogen/config.in. (HAVE_EXECINFO_H, TERM_HEADER): New macros. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-09-01 06:38:52 +0000 +++ nt/ChangeLog 2012-09-02 02:00:47 +0000 @@ -1,3 +1,8 @@ +2012-09-02 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (HAVE_EXECINFO_H, TERM_HEADER): New macros. + 2012-09-01 Daniel Colascione * inc/ms-w32.h (TERM_HEADER): Add for refactoring === modified file 'nt/config.nt' --- nt/config.nt 2012-08-28 16:01:59 +0000 +++ nt/config.nt 2012-09-02 02:00:47 +0000 @@ -364,6 +364,9 @@ /* Define to 1 if you have the `euidaccess' function. */ #undef HAVE_EUIDACCESS +/* Define to 1 if you have the header file. */ +#define HAVE_EXECINFO_H 1 + /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H @@ -1352,6 +1355,9 @@ /* Define to 1 if you use terminfo instead of termcap. */ #undef TERMINFO +/* Define to the header for the built-in window system. */ +#undef TERM_HEADER + /* Define to 1 if you can safely include both and . */ #define TIME_WITH_SYS_TIME 1 ------------------------------------------------------------ revno: 109846 fixes bug: http://debbugs.gnu.org/12283 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-09-01 17:56:03 -0700 message: * lisp/simple.el (undo): Tweak message in undo-only case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-01 22:03:06 +0000 +++ lisp/ChangeLog 2012-09-02 00:56:03 +0000 @@ -1,3 +1,7 @@ +2012-09-02 Glenn Morris + + * simple.el (undo): Tweak message in undo-only case. (Bug#12283) + 2012-09-01 Glenn Morris * term.el: Tidy up menu definitions. === modified file 'lisp/simple.el' --- lisp/simple.el 2012-08-30 17:09:11 +0000 +++ lisp/simple.el 2012-09-02 00:56:03 +0000 @@ -1886,9 +1886,10 @@ ;; so, ask the user whether she wants to skip the redo/undo pair. (let ((equiv (gethash pending-undo-list undo-equiv-table))) (or (eq (selected-window) (minibuffer-window)) - (setq message (if undo-in-region - (if equiv "Redo in region!" "Undo in region!") - (if equiv "Redo!" "Undo!")))) + (setq message (format "%s%s!" + (if (or undo-no-redo (not equiv)) + "Undo" "Redo") + (if undo-in-region " in region" "")))) (when (and (consp equiv) undo-no-redo) ;; The equiv entry might point to another redo record if we have done ;; undo-redo-undo-redo-... so skip to the very last equiv. ------------------------------------------------------------ revno: 109845 fixes bug: http://debbugs.gnu.org/11957 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-09-01 15:03:06 -0700 message: Tidy up term.el menu handling * lisp/term.el: (term-mode-map): Use easymenu for In/Out, Complete menus. (term-pager-break-map): Initialize in the defvar. (term-terminal-menu, term-signals-menu): Define with easymenu. (term-terminal-menu): Also show it in line-mode. (term-pager-menu): New, extracted from term-process-pager. (term-mode, term-char-mode, term-process-pager): Use easymenu-add. (term-update-mode-line): Propertize line/char and page items. (term-process-pager): Move keymap initialization elsewhere. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-01 16:47:09 +0000 +++ lisp/ChangeLog 2012-09-01 22:03:06 +0000 @@ -1,3 +1,15 @@ +2012-09-01 Glenn Morris + + * term.el: Tidy up menu definitions. + (term-mode-map): Use easymenu for In/Out, Complete menus. + (term-pager-break-map): Initialize in the defvar. + (term-terminal-menu, term-signals-menu): Define with easymenu. + (term-terminal-menu): Also show it in line-mode. (Bug#11957) + (term-pager-menu): New, extracted from term-process-pager. + (term-mode, term-char-mode, term-process-pager): Use easymenu-add. + (term-update-mode-line): Propertize line/char and page items. + (term-process-pager): Move keymap initialization elsewhere. + 2012-09-01 Martin Rudalics * window.el (switch-to-prev-buffer): Handle additional values of === modified file 'lisp/term.el' --- lisp/term.el 2012-07-11 23:13:41 +0000 +++ lisp/term.el 2012-09-01 22:03:06 +0000 @@ -615,28 +615,6 @@ :type 'hook :group 'term) -(defvar term-signals-menu - (let ((map (make-sparse-keymap "Signals"))) - (define-key map [eof] - '(menu-item "EOF" term-send-eof - :help "Send an EOF to the current buffer's process")) - (define-key map [kill] - '(menu-item "KILL" term-kill-subjob - :help "Send kill signal to the current subjob")) - (define-key map [quit] - '(menu-item "QUIT" term-quit-subjob - :help "Send quit signal to the current subjob.")) - (define-key map [cont] - '(menu-item "CONT" term-continue-subjob - :help "Send CONT signal to process buffer's process group")) - (define-key map [stop] - '(menu-item "STOP" term-stop-subjob - :help "Stop the current subjob")) - (define-key map [brk] - '(menu-item "BREAK" term-interrupt-subjob - :help "Interrupt the current subjob")) - (cons "Signals" map))) - (defvar term-mode-map (let ((map (make-sparse-keymap))) (define-key map "\ep" 'term-previous-input) @@ -667,69 +645,61 @@ (define-key map "\C-c\C-k" 'term-char-mode) (define-key map "\C-c\C-j" 'term-line-mode) (define-key map "\C-c\C-q" 'term-pager-toggle) - - ;; completion: (line mode only) - (let ((completion-menu (make-sparse-keymap "Complete"))) - (define-key map [menu-bar completion] - (cons "Complete" completion-menu)) - (define-key completion-menu [complete-expand] - '("Expand File Name" . term-replace-by-expanded-filename)) - (define-key completion-menu [complete-listing] - '("File Completion Listing" . term-dynamic-list-filename-completions)) - (define-key completion-menu [complete-file] - '("Complete File Name" . term-dynamic-complete-filename)) - (define-key completion-menu [complete] - '("Complete Before Point" . term-dynamic-complete))) - + ;; completion: (line mode only) + (easy-menu-define nil map "Complete menu for Term mode." + '("Complete" + ["Complete Before Point" term-dynamic-complete t] + ["Complete File Name" term-dynamic-complete-filename t] + ["File Completion Listing" term-dynamic-list-filename-completions t] + ["Expand File Name" term-replace-by-expanded-filename t])) ;; Input history: (line mode only) - (let ((inout-menu (make-sparse-keymap "In/Out"))) - (define-key map [menu-bar inout] - (cons "In/Out" inout-menu)) - (define-key inout-menu [kill-output] - '("Kill Current Output Group" . term-kill-output)) - (define-key inout-menu [next-prompt] - '("Forward Output Group" . term-next-prompt)) - (define-key inout-menu [previous-prompt] - '("Backward Output Group" . term-previous-prompt)) - (define-key inout-menu [show-maximum-output] - '("Show Maximum Output" . term-show-maximum-output)) - (define-key inout-menu [show-output] - '("Show Current Output Group" . term-show-output)) - (define-key inout-menu [kill-input] - '("Kill Current Input" . term-kill-input)) - (define-key inout-menu [copy-input] - '("Copy Old Input" . term-copy-old-input)) - (define-key inout-menu [forward-matching-history] - '("Forward Matching Input..." . term-forward-matching-input)) - (define-key inout-menu [backward-matching-history] - '("Backward Matching Input..." . term-backward-matching-input)) - (define-key inout-menu [next-matching-history] - '("Next Matching Input..." . term-next-matching-input)) - (define-key inout-menu [previous-matching-history] - '("Previous Matching Input..." . term-previous-matching-input)) - (define-key inout-menu [next-matching-history-from-input] - '("Next Matching Current Input" . term-next-matching-input-from-input)) - (define-key inout-menu [previous-matching-history-from-input] - '("Previous Matching Current Input" . - term-previous-matching-input-from-input)) - (define-key inout-menu [next-history] - '("Next Input" . term-next-input)) - (define-key inout-menu [previous-history] - '("Previous Input" . term-previous-input)) - (define-key inout-menu [list-history] - '("List Input History" . term-dynamic-list-input-ring)) - (define-key inout-menu [expand-history] - '("Expand History Before Point" . term-replace-by-expanded-history))) - - (define-key map [menu-bar signals] term-signals-menu) - - map)) + (easy-menu-define nil map "In/Out menu for Term mode." + '("In/Out" + ["Expand History Before Point" term-replace-by-expanded-history + term-input-autoexpand] + ["List Input History" term-dynamic-list-input-ring t] + ["Previous Input" term-previous-input t] + ["Next Input" term-next-input t] + ["Previous Matching Current Input" + term-previous-matching-input-from-input t] + ["Next Matching Current Input" term-next-matching-input-from-input t] + ["Previous Matching Input..." term-previous-matching-input t] + ["Next Matching Input..." term-next-matching-input t] + ["Backward Matching Input..." term-backward-matching-input t] + ["Forward Matching Input..." term-forward-matching-input t] + ["Copy Old Input" term-copy-old-input t] + ["Kill Current Input" term-kill-input t] + ["Show Current Output Group" term-show-output t] + ["Show Maximum Output" term-show-maximum-output t] + ["Backward Output Group" term-previous-prompt t] + ["Forward Output Group" term-next-prompt t] + ["Kill Current Output Group" term-kill-output t])) + map) + "Keymap for Term mode.") (defvar term-escape-char nil "Escape character for char sub-mode of term mode. Do not change it directly; use `term-set-escape-char' instead.") -(defvar term-pager-break-map nil) +(defvar term-pager-break-map + (let ((map (make-keymap))) + ;; (dotimes (i 128) + ;; (define-key map (make-string 1 i) 'term-send-raw)) + (define-key map "\e" (lookup-key (current-global-map) "\e")) + (define-key map "\C-x" (lookup-key (current-global-map) "\C-x")) + (define-key map "\C-u" (lookup-key (current-global-map) "\C-u")) + (define-key map " " 'term-pager-page) + (define-key map "\r" 'term-pager-line) + (define-key map "?" 'term-pager-help) + (define-key map "h" 'term-pager-help) + (define-key map "b" 'term-pager-back-page) + (define-key map "\177" 'term-pager-back-line) + (define-key map "q" 'term-pager-discard) + (define-key map "D" 'term-pager-disable) + (define-key map "<" 'term-pager-bob) + (define-key map ">" 'term-pager-eob) + map) + "Keymap used in Term pager mode.") (defvar term-ptyp t "True if communications via pty; false if by pipe. Buffer local. @@ -750,7 +720,6 @@ ; assuming this is Emacs 19.20 or newer. (defvar term-pager-filter t) -(put 'term-replace-by-expanded-history 'menu-enable 'term-input-autoexpand) (put 'term-input-ring 'permanent-local t) (put 'term-input-ring-index 'permanent-local t) (put 'term-input-autoexpand 'permanent-local t) @@ -879,28 +848,6 @@ :group 'term :type 'integer) -(defvar term-terminal-menu - (if (featurep 'xemacs) - '("Terminal" - [ "Character mode" term-char-mode (term-in-line-mode)] - [ "Line mode" term-line-mode (term-in-char-mode)] - [ "Enable paging" term-pager-toggle (not term-pager-count)] - [ "Disable paging" term-pager-toggle term-pager-count]) - (let ((map (make-sparse-keymap "Terminal"))) - (define-key map [terminal-pager-enable] - '(menu-item "Enable paging" term-fake-pager-enable - :help "Enable paging feature")) - (define-key map [terminal-pager-disable] - '(menu-item "Disable paging" term-fake-pager-disable - :help "Disable paging feature")) - (define-key map [terminal-char-mode] - '(menu-item "Character mode" term-char-mode - :help "Switch to char (raw) sub-mode of term mode")) - (define-key map [terminal-line-mode] - '(menu-item "Line mode" term-line-mode - :help "Switch to line (cooked) sub-mode of term mode")) - (cons "Terminal" map)))) - ;; Set up term-raw-map, etc. (defvar term-raw-map @@ -920,9 +867,7 @@ (if (featurep 'xemacs) (define-key map [button2] 'term-mouse-paste) - (define-key map [mouse-2] 'term-mouse-paste) - (define-key map [menu-bar terminal] term-terminal-menu) - (define-key map [menu-bar signals] term-signals-menu)) + (define-key map [mouse-2] 'term-mouse-paste)) (define-key map [up] 'term-send-up) (define-key map [down] 'term-send-down) (define-key map [right] 'term-send-right) @@ -941,6 +886,46 @@ map) "Keyboard map for sending characters directly to the inferior process.") +(easy-menu-define term-terminal-menu + (list term-mode-map term-raw-map term-pager-break-map) + "Terminal menu for Term mode." + '("Terminal" + ["Line mode" term-line-mode :active (term-in-char-mode) + :help "Switch to line (cooked) sub-mode of term mode"] + ["Character mode" term-char-mode :active (term-in-line-mode) + :help "Switch to char (raw) sub-mode of term mode"] + ["Paging" term-pager-toggle :style toggle :selected term-pager-count + :help "Toggle paging feature"])) + +(easy-menu-define term-signals-menu + (list term-mode-map term-raw-map term-pager-break-map) + "Signals menu for Term mode." + '("Signals" + ["BREAK" term-interrupt-subjob :active t + :help "Interrupt the current subjob"] + ["STOP" term-stop-subjob :active t :help "Stop the current subjob"] + ["CONT" term-continue-subjob :active t + :help "Send CONT signal to process buffer's process group"] + ["QUIT" term-quit-subjob :active t + :help "Send quit signal to the current subjob"] + ["KILL" term-kill-subjob :active t + :help "Send kill signal to the current subjob"] + ["EOF" term-send-eof :active t + :help "Send an EOF to the current buffer's process"])) + +(easy-menu-define term-pager-menu term-pager-break-map + "Menu for Term pager mode." + '("More pages?" + ["1 page forwards" term-pager-page t] + ["1 page backwards" term-pager-back-page t] + ["1 line backwards" term-pager-back-line t] + ["1 line forwards" term-pager-line t] + ["Goto to beginning" term-pager-bob t] + ["Goto to end" term-pager-eob t] + ["Discard remaining output" term-pager-discard t] + ["Disable paging" term-pager-toggle t] + ["Help" term-pager-help t])) + (defvar term-raw-escape-map (let ((map (make-sparse-keymap))) (set-keymap-parent map 'Control-X-prefix) @@ -1151,9 +1136,8 @@ (set (make-local-variable 'font-lock-defaults) '(nil t)) - (when (featurep 'xemacs) - (set-buffer-menubar - (append current-menubar (list term-terminal-menu)))) + (easy-menu-add term-terminal-menu) + (easy-menu-add term-signals-menu) (or term-input-ring (setq term-input-ring (make-ring term-input-ring-size))) (term-update-mode-line)) @@ -1291,6 +1275,8 @@ (when (term-in-line-mode) (setq term-old-mode-map (current-local-map)) (use-local-map term-raw-map) + (easy-menu-add term-terminal-menu) + (easy-menu-add term-signals-menu) ;; Send existing partial line to inferior (without newline). (let ((pmark (process-mark (get-buffer-process (current-buffer)))) @@ -1315,8 +1301,31 @@ (term-update-mode-line))) (defun term-update-mode-line () - (let ((term-mode (if (term-in-char-mode) "char" "line")) - (term-page (when (term-pager-enabled) " page")) + (let ((term-mode + (if (term-in-char-mode) + (propertize "char" + 'help-echo "mouse-1: Switch to line mode" + 'mouse-face 'mode-line-highlight + 'local-map + '(keymap + (mode-line keymap (down-mouse-1 . term-line-mode)))) + (propertize "line" + 'help-echo "mouse-1: Switch to char mode" + 'mouse-face 'mode-line-highlight + 'local-map + '(keymap + (mode-line keymap (down-mouse-1 . term-char-mode)))))) + (term-page + (when (term-pager-enabled) + (concat " " + (propertize + "page" + 'help-echo "mouse-1: Disable paging" + 'mouse-face 'mode-line-highlight + 'local-map + '(keymap + (mode-line keymap (down-mouse-1 . + term-pager-toggle))))))) (serial-item-speed) (serial-item-config) (proc (get-buffer-process (current-buffer)))) @@ -3463,54 +3472,13 @@ ;; The page is full, so enter "pager" mode, and wait for input. (defun term-process-pager () - (when (not term-pager-break-map) - (let* ((map (make-keymap)) - ;; (i 0) - tmp) - ;; (while (< i 128) - ;; (define-key map (make-string 1 i) 'term-send-raw) - ;; (setq i (1+ i))) - (define-key map "\e" - (lookup-key (current-global-map) "\e")) - (define-key map "\C-x" - (lookup-key (current-global-map) "\C-x")) - (define-key map "\C-u" - (lookup-key (current-global-map) "\C-u")) - (define-key map " " 'term-pager-page) - (define-key map "\r" 'term-pager-line) - (define-key map "?" 'term-pager-help) - (define-key map "h" 'term-pager-help) - (define-key map "b" 'term-pager-back-page) - (define-key map "\177" 'term-pager-back-line) - (define-key map "q" 'term-pager-discard) - (define-key map "D" 'term-pager-disable) - (define-key map "<" 'term-pager-bob) - (define-key map ">" 'term-pager-eob) - - ;; Add menu bar. - (unless (featurep 'xemacs) - (define-key map [menu-bar terminal] term-terminal-menu) - (define-key map [menu-bar signals] term-signals-menu) - (setq tmp (make-sparse-keymap "More pages?")) - (define-key tmp [help] '("Help" . term-pager-help)) - (define-key tmp [disable] - '("Disable paging" . term-fake-pager-disable)) - (define-key tmp [discard] - '("Discard remaining output" . term-pager-discard)) - (define-key tmp [eob] '("Goto to end" . term-pager-eob)) - (define-key tmp [bob] '("Goto to beginning" . term-pager-bob)) - (define-key tmp [line] '("1 line forwards" . term-pager-line)) - (define-key tmp [bline] '("1 line backwards" . term-pager-back-line)) - (define-key tmp [back] '("1 page backwards" . term-pager-back-page)) - (define-key tmp [page] '("1 page forwards" . term-pager-page)) - (define-key map [menu-bar page] (cons "More pages?" tmp)) - ) - - (setq term-pager-break-map map))) ;; (let ((process (get-buffer-process (current-buffer)))) ;; (stop-process process)) (setq term-pager-old-local-map (current-local-map)) (use-local-map term-pager-break-map) + (easy-menu-add term-terminal-menu) + (easy-menu-add term-signals-menu) + (easy-menu-add term-pager-menu) (make-local-variable 'term-old-mode-line-format) (setq term-old-mode-line-format mode-line-format) (setq mode-line-format @@ -3591,14 +3559,6 @@ (interactive) (if (term-pager-enabled) (term-pager-disable) (term-pager-enable))) -(unless (featurep 'xemacs) - (defalias 'term-fake-pager-enable 'term-pager-toggle) - (defalias 'term-fake-pager-disable 'term-pager-toggle) - (put 'term-char-mode 'menu-enable '(term-in-line-mode)) - (put 'term-line-mode 'menu-enable '(term-in-char-mode)) - (put 'term-fake-pager-enable 'menu-enable '(not term-pager-count)) - (put 'term-fake-pager-disable 'menu-enable 'term-pager-count)) - (defun term-pager-help () "Provide help on commands available in a terminal-emulator **MORE** break." (interactive) ------------------------------------------------------------ revno: 109844 committer: Paul Eggert branch nick: trunk timestamp: Sat 2012-09-01 11:54:38 -0700 message: * configure.ac (_FORTIFY_SOURCE): Define only when optimizing. This ports to glibc 2.15 or later, when configured with --enable-gcc-warnings. See Eric Blake in . diff: === modified file 'ChangeLog' --- ChangeLog 2012-09-01 06:38:52 +0000 +++ ChangeLog 2012-09-01 18:54:38 +0000 @@ -1,3 +1,10 @@ +2012-09-01 Paul Eggert + + * configure.ac (_FORTIFY_SOURCE): Define only when optimizing. + This ports to glibc 2.15 or later, when configured with + --enable-gcc-warnings. See Eric Blake in + . + 2012-09-01 Daniel Colascione * configure.ac: Introduce term_header variable, which holds the === modified file 'configure.ac' --- configure.ac 2012-09-01 06:38:52 +0000 +++ configure.ac 2012-09-01 18:54:38 +0000 @@ -737,8 +737,13 @@ gl_WARN_ADD([-funit-at-a-time]) AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting glibc 2.15+. */ + #if defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks]) # We use a slightly smaller set of warning options for lib/. ------------------------------------------------------------ revno: 109843 committer: martin rudalics branch nick: trunk timestamp: Sat 2012-09-01 18:47:09 +0200 message: Rewrite switch-to-prev-/next-buffer and quit-window; add display-buffer-below-selected. * window.el (switch-to-prev-buffer): Handle additional values of BURY-OR-KILL argument. Don't switch in minibuffer window. (switch-to-next-buffer): Don't switch in minibuffer window. (quit-restore-window): New function based on quit-window. Handle additional values of former KILL argument. (quit-window): Call quit-restore-window with appropriate interpretation of KILL argument. (display-buffer-below-selected): New buffer display action function. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-01 04:28:24 +0000 +++ lisp/ChangeLog 2012-09-01 16:47:09 +0000 @@ -1,3 +1,15 @@ +2012-09-01 Martin Rudalics + + * window.el (switch-to-prev-buffer): Handle additional values of + BURY-OR-KILL argument. Don't switch in minibuffer window. + (switch-to-next-buffer): Don't switch in minibuffer window. + (quit-restore-window): New function based on quit-window. + Handle additional values of former KILL argument. + (quit-window): Call quit-restore-window with appropriate + interpretation of KILL argument. + (display-buffer-below-selected): New buffer display action + function. + 2012-09-01 Stefan Monnier * minibuffer.el (completion-at-point-functions): Complete docstring === modified file 'lisp/window.el' --- lisp/window.el 2012-08-31 16:51:49 +0000 +++ lisp/window.el 2012-09-01 16:47:09 +0000 @@ -2972,7 +2972,12 @@ Optional argument BURY-OR-KILL non-nil means the buffer currently shown in WINDOW is about to be buried or killed and consequently -shall not be switched to in future invocations of this command." +shall not be switched to in future invocations of this command. + +As a special case, if BURY-OR-KILL equals `append', this means to +move the buffer to the end of WINDOW's previous buffers list so a +future invocation of `switch-to-prev-buffer' less likely switches +to it." (interactive) (let* ((window (window-normalize-window window t)) (frame (window-frame window)) @@ -2980,26 +2985,34 @@ ;; Save this since it's destroyed by `set-window-buffer'. (next-buffers (window-next-buffers window)) (pred (frame-parameter frame 'buffer-predicate)) - entry buffer new-buffer killed-buffers visible) + entry new-buffer killed-buffers visible) + (when (window-minibuffer-p window) + ;; Don't switch in minibuffer window. + (unless (setq window (minibuffer-selected-window)) + (error "Window %s is a minibuffer window" window))) + (when (window-dedicated-p window) + ;; Don't switch in dedicated window. (error "Window %s is dedicated to buffer %s" window old-buffer)) (catch 'found ;; Scan WINDOW's previous buffers first, skipping entries of next ;; buffers. (dolist (entry (window-prev-buffers window)) - (when (and (setq buffer (car entry)) - (or (buffer-live-p buffer) + (when (and (setq new-buffer (car entry)) + (or (buffer-live-p new-buffer) (not (setq killed-buffers - (cons buffer killed-buffers)))) - (or (null pred) (funcall pred buffer)) - (not (eq buffer old-buffer)) - (or bury-or-kill (not (memq buffer next-buffers)))) + (cons new-buffer killed-buffers)))) + (not (eq new-buffer old-buffer)) + (or (null pred) (funcall pred new-buffer)) + ;; When BURY-OR-KILL is nil, avoid switching to a + ;; buffer in WINDOW's next buffers list. + (or bury-or-kill (not (memq new-buffer next-buffers)))) (if (and (not switch-to-visible-buffer) - (get-buffer-window buffer frame)) - ;; Try to avoid showing a buffer visible in some other window. - (setq visible buffer) - (setq new-buffer buffer) + (get-buffer-window new-buffer frame)) + ;; Try to avoid showing a buffer visible in some other + ;; window. + (setq visible new-buffer) (set-window-buffer-start-and-point window new-buffer (nth 1 entry) (nth 2 entry)) (throw 'found t)))) @@ -3014,8 +3027,8 @@ (nreverse (buffer-list frame)))) (when (and (buffer-live-p buffer) (not (eq buffer old-buffer)) + (or (null pred) (funcall pred buffer)) (not (eq (aref (buffer-name buffer) 0) ?\s)) - (or (null pred) (funcall pred buffer)) (or bury-or-kill (not (memq buffer next-buffers)))) (if (get-buffer-window buffer frame) ;; Try to avoid showing a buffer visible in some other window. @@ -3047,12 +3060,20 @@ (set-window-buffer-start-and-point window new-buffer))) (if bury-or-kill - ;; Remove `old-buffer' from WINDOW's previous and (restored list - ;; of) next buffers. - (progn + (let ((entry (and (eq bury-or-kill 'append) + (assq old-buffer (window-prev-buffers window))))) + ;; Remove `old-buffer' from WINDOW's previous and (restored list + ;; of) next buffers. (set-window-prev-buffers window (assq-delete-all old-buffer (window-prev-buffers window))) - (set-window-next-buffers window (delq old-buffer next-buffers))) + (set-window-next-buffers window (delq old-buffer next-buffers)) + (when entry + ;; Append old-buffer's entry to list of WINDOW's previous + ;; buffers so it's less likely to get switched to soon but + ;; `display-buffer-in-previous-window' can nevertheless find + ;; it. + (set-window-prev-buffers + window (append (window-prev-buffers window) (list entry))))) ;; Move `old-buffer' to head of WINDOW's restored list of next ;; buffers. (set-window-next-buffers @@ -3080,8 +3101,14 @@ (old-buffer (window-buffer window)) (next-buffers (window-next-buffers window)) (pred (frame-parameter frame 'buffer-predicate)) - buffer new-buffer entry killed-buffers visible) + new-buffer entry killed-buffers visible) + (when (window-minibuffer-p window) + ;; Don't switch in minibuffer window. + (unless (setq window (minibuffer-selected-window)) + (error "Window %s is a minibuffer window" window))) + (when (window-dedicated-p window) + ;; Don't switch in dedicated window. (error "Window %s is dedicated to buffer %s" window old-buffer)) (catch 'found @@ -3100,9 +3127,10 @@ ;; Scan the buffer list of WINDOW's frame next, skipping previous ;; buffers entries. (dolist (buffer (buffer-list frame)) - (when (and (buffer-live-p buffer) (not (eq buffer old-buffer)) + (when (and (buffer-live-p buffer) + (not (eq buffer old-buffer)) + (or (null pred) (funcall pred buffer)) (not (eq (aref (buffer-name buffer) 0) ?\s)) - (or (null pred) (funcall pred buffer)) (not (assq buffer (window-prev-buffers window)))) (if (get-buffer-window buffer frame) ;; Try to avoid showing a buffer visible in some other window. @@ -3113,18 +3141,17 @@ ;; Scan WINDOW's reverted previous buffers last (must not use ;; nreverse here!) (dolist (entry (reverse (window-prev-buffers window))) - (when (and (setq buffer (car entry)) - (or (buffer-live-p buffer) + (when (and (setq new-buffer (car entry)) + (or (buffer-live-p new-buffer) (not (setq killed-buffers - (cons buffer killed-buffers)))) - (or (null pred) (funcall pred buffer)) - (not (eq buffer old-buffer))) + (cons new-buffer killed-buffers)))) + (not (eq new-buffer old-buffer)) + (or (null pred) (funcall pred new-buffer))) (if (and (not switch-to-visible-buffer) - (get-buffer-window buffer frame)) + (get-buffer-window new-buffer frame)) ;; Try to avoid showing a buffer visible in some other window. (unless visible - (setq visible buffer)) - (setq new-buffer buffer) + (setq visible new-buffer)) (set-window-buffer-start-and-point window new-buffer (nth 1 entry) (nth 2 entry)) (throw 'found t)))) @@ -3351,18 +3378,35 @@ ;; Unrecord BUFFER in WINDOW. (unrecord-window-buffer window buffer))))) -(defun quit-window (&optional kill window) - "Quit WINDOW and bury its buffer. +(defun quit-restore-window (&optional window bury-or-kill) + "Quit WINDOW and deal with its buffer. WINDOW must be a live window and defaults to the selected one. -With prefix argument KILL non-nil, kill the buffer instead of -burying it. According to information stored in WINDOW's `quit-restore' window parameter either (1) delete WINDOW and its frame, (2) delete WINDOW, (3) restore the buffer previously displayed in WINDOW, or (4) make WINDOW display some other buffer than the present -one. If non-nil, reset `quit-restore' parameter to nil." - (interactive "P") +one. If non-nil, reset `quit-restore' parameter to nil. + +Optional second argument BURY-OR-KILL tells how to proceed with +the buffer of WINDOW. The following values are handled: + +`nil' means to not handle the buffer in a particular way. This + means that if WINDOW is not deleted by this function, invoking + `switch-to-prev-buffer' will usually show the buffer again. + +`append' means that if WINDOW is not deleted, move its buffer to + the end of WINDOW's previous buffers so it's less likely that a + future invocation of `switch-to-prev-buffer' will switch to it. + Also, move the buffer to the end of the frame's buffer list. + +`bury' means that if WINDOW is not deleted, remove its buffer + from WINDOW'S list of previous buffers. Also, move the buffer + to the end of the frame's buffer list. This value provides the + most reliable remedy to not have `switch-to-prev-buffer' switch + to this buffer again without killing the buffer. + +`kill' means to kill WINDOW's buffer." (setq window (window-normalize-window window t)) (let* ((buffer (window-buffer window)) (quit-restore (window-parameter window 'quit-restore)) @@ -3374,13 +3418,13 @@ (not (eq (setq prev-buffer (cadr prev-buffers)) buffer)))) prev-buffer))) - quad resize) + quad entry) (cond ((and (not prev-buffer) (memq (nth 1 quit-restore) '(window frame)) (eq (nth 3 quit-restore) buffer) ;; Delete WINDOW if possible. - (window--delete window nil kill)) + (window--delete window nil (eq bury-or-kill 'kill))) ;; If the previously selected window is still alive, select it. (when (window-live-p (nth 2 quit-restore)) (select-window (nth 2 quit-restore)))) @@ -3388,21 +3432,32 @@ (buffer-live-p (car quad)) (eq (nth 3 quit-restore) buffer)) ;; Show another buffer stored in quit-restore parameter. - (setq resize (and (integerp (nth 3 quad)) - (/= (nth 3 quad) (window-total-size window)))) - (set-window-dedicated-p window nil) - (when resize + (when (and (integerp (nth 3 quad)) + (/= (nth 3 quad) (window-total-size window))) ;; Try to resize WINDOW to its old height but don't signal an ;; error. (condition-case nil (window-resize window (- (nth 3 quad) (window-total-size window))) (error nil))) + (set-window-dedicated-p window nil) ;; Restore WINDOW's previous buffer, start and point position. (set-window-buffer-start-and-point window (nth 0 quad) (nth 1 quad) (nth 2 quad)) - ;; Unrecord WINDOW's buffer here (Bug#9937) to make sure it's not - ;; re-recorded by `set-window-buffer'. - (unrecord-window-buffer window buffer) + ;; Deal with the buffer we just removed from WINDOW. + (setq entry (and (eq bury-or-kill 'append) + (assq buffer (window-prev-buffers window)))) + (when bury-or-kill + ;; Remove buffer from WINDOW's previous and next buffers. + (set-window-prev-buffers + window (assq-delete-all buffer (window-prev-buffers window))) + (set-window-next-buffers + window (delq buffer (window-next-buffers window)))) + (when entry + ;; Append old buffer's entry to list of WINDOW's previous + ;; buffers so it's less likely to get switched to soon but + ;; `display-buffer-in-previous-window' can nevertheless find it. + (set-window-prev-buffers + window (append (window-prev-buffers window) (list entry)))) ;; Reset the quit-restore parameter. (set-window-parameter window 'quit-restore nil) ;; Select old window. @@ -3414,12 +3469,29 @@ (set-window-parameter window 'quit-restore nil) ;; Make sure that WINDOW is no more dedicated. (set-window-dedicated-p window nil) - (switch-to-prev-buffer window 'bury-or-kill))) - - ;; Kill WINDOW's old-buffer if requested - (if kill - (kill-buffer buffer) - (bury-buffer-internal buffer)))) + (switch-to-prev-buffer window bury-or-kill))) + + ;; Deal with the buffer. + (cond + ((not (buffer-live-p buffer))) + ((eq bury-or-kill 'kill) + (kill-buffer buffer)) + (bury-or-kill + (bury-buffer-internal buffer))))) + +(defun quit-window (&optional kill window) + "Quit WINDOW and bury its buffer. +WINDOW must be a live window and defaults to the selected one. +With prefix argument KILL non-nil, kill the buffer instead of +burying it. + +According to information stored in WINDOW's `quit-restore' window +parameter either (1) delete WINDOW and its frame, (2) delete +WINDOW, (3) restore the buffer previously displayed in WINDOW, +or (4) make WINDOW display some other buffer than the present +one. If non-nil, reset `quit-restore' parameter to nil." + (interactive "P") + (quit-restore-window window (if kill 'kill 'bury))) (defun quit-windows-on (&optional buffer-or-name kill frame) "Quit all windows showing BUFFER-OR-NAME. @@ -5330,6 +5402,20 @@ (and pop-up-windows (display-buffer-pop-up-window buffer alist)))) +(defun display-buffer-below-selected (buffer _alist) + "Try displaying BUFFER in a window below the selected window. +This either splits the selected window or reuses the window below +the selected one." + (let (window) + (or (and (not (frame-parameter nil 'unsplittable)) + (setq window (window--try-to-split-window (selected-window))) + (window--display-buffer + buffer window 'window display-buffer-mark-dedicated)) + (and (setq window (window-in-direction 'below)) + (not (window-dedicated-p window)) + (window--display-buffer + buffer window 'reuse display-buffer-mark-dedicated))))) + (defun display-buffer-use-some-window (buffer alist) "Display BUFFER in an existing window. Search for a usable window, set that window to the buffer, and ------------------------------------------------------------ revno: 109842 fixes bug: http://debbugs.gnu.org/11860 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2012-09-01 16:54:27 +0300 message: Further fix for bug #11860 with Arabic display on Windows. src/w32uniscribe.c (uniscribe_shape): Handle correctly the case of more than one grapheme cluster passed to the shaper: compute the offset adjustment values separately for each cluster. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-01 12:23:50 +0000 +++ src/ChangeLog 2012-09-01 13:54:27 +0000 @@ -1,5 +1,9 @@ 2012-09-01 Eli Zaretskii + * w32uniscribe.c (uniscribe_shape): Handle correctly the case of + more than one grapheme cluster passed to the shaper: compute the + offset adjustment values separately for each cluster. (Bug#11860) + * image.c: Restore mistakenly removed inclusion of w32.h. Without it, GCC doesn't see prototypes of w32_delayed_load, and complains about implicit conversions from integer to pointer. === modified file 'src/w32uniscribe.c' --- src/w32uniscribe.c 2012-08-21 17:14:08 +0000 +++ src/w32uniscribe.c 2012-09-01 13:54:27 +0000 @@ -322,22 +322,6 @@ { int j, from, to, adj_offset = 0; - /* For RTL text, the Uniscribe shaper prepares the - values in ADVANCES array for layout in reverse order, - whereby "advance width" is applied to move the pen in - reverse direction and _before_ drawing the glyph. - Since we draw glyphs in their normal left-to-right - order, we need to adjust the coordinates of each - non-base glyph in a grapheme cluster via X-OFF - component of the gstring's ADJUSTMENT sub-vector. - This loop computes the initial value of the - adjustment for the base character, which is then - updated for each successive glyph in the grapheme - cluster. */ - if (items[i].a.fRTL) - for (j = 1; j < nglyphs; j++) - adj_offset += advances[j]; - from = 0; to = from; @@ -380,6 +364,32 @@ } } } + + /* For RTL text, the Uniscribe shaper prepares + the values in ADVANCES array for layout in + reverse order, whereby "advance width" is + applied to move the pen in reverse direction + and _before_ drawing the glyph. Since we + draw glyphs in their normal left-to-right + order, we need to adjust the coordinates of + each non-base glyph in a grapheme cluster via + X-OFF component of the gstring's ADJUSTMENT + sub-vector. This loop computes, for each + grapheme cluster, the initial value of the + adjustment for the base character, which is + then updated for each successive glyph in the + grapheme cluster. */ + if (items[i].a.fRTL) + { + int j1 = j; + + adj_offset = 0; + while (j1 < nglyphs && !attributes[j1].fClusterStart) + { + adj_offset += advances[j1]; + j1++; + } + } } LGLYPH_SET_CHAR (lglyph, chars[items[i].iCharPos ------------------------------------------------------------ revno: 109841 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2012-09-01 15:23:50 +0300 message: Remove conflict markers and fix entries for revision 109836. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-01 09:29:17 +0000 +++ src/ChangeLog 2012-09-01 12:23:50 +0000 @@ -37,7 +37,7 @@ * w32term.h (FRAME_X_WINDOW): Use FRAME_W32_WINDOW instead of directly accessing frame internals. - * w32font.h (w): Include font.h. Define syms_of_w32font and + * w32font.h: Include font.h. Define syms_of_w32font and globals_of_w32font. * process.c: Include TERM_HEADER instead of listing all possible @@ -80,15 +80,14 @@ * emacs.c: Include TERM_HEADER. - * dispnew.c (d): Include TERM_HEADER instead of listing all - possible window-system headers. + * dispnew.c: Include TERM_HEADER instead of listing all possible + window-system headers. - * ccl.h (c): Include character.h. + * ccl.h: Include character.h. * Makefile.in: Define WINDOW_SYSTEM_OBJ to hold objects needed for the current window system; include in list of objects to link into Emacs. ->>>>>>> MERGE-SOURCE 2012-08-31 Dmitry Antipov ------------------------------------------------------------ revno: 109840 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-09-01 06:20:47 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2012-08-28 16:01:59 +0000 +++ lisp/ldefs-boot.el 2012-09-01 10:20:47 +0000 @@ -5,7 +5,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (20478 3673 653810 0)) +;;;;;; "play/5x5.el" (20545 57511 257469 0)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -114,7 +114,7 @@ ;;;;;; add-change-log-entry-other-window add-change-log-entry find-change-log ;;;;;; prompt-for-change-log-name add-log-mailing-address add-log-full-name ;;;;;; add-log-current-defun-function) "add-log" "vc/add-log.el" -;;;;;; (20495 51111 757560 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -398,7 +398,7 @@ ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (20355 10021 546955 0)) +;;;;;; align) "align" "align.el" (20515 36389 544939 0)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -489,7 +489,7 @@ ;;;### (autoloads (outlineify-sticky allout-mode allout-mode-p allout-auto-activation ;;;;;; allout-setup allout-auto-activation-helper) "allout" "allout.el" -;;;;;; (20399 35365 4050 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from allout.el (autoload 'allout-auto-activation-helper "allout" "\ @@ -850,7 +850,7 @@ ;;;### (autoloads (allout-widgets-mode allout-widgets-auto-activation ;;;;;; allout-widgets-setup allout-widgets) "allout-widgets" "allout-widgets.el" -;;;;;; (20437 50597 545250 0)) +;;;;;; (20545 57511 257469 0)) ;;; Generated autoloads from allout-widgets.el (let ((loads (get 'allout-widgets 'custom-loads))) (if (member '"allout-widgets" loads) nil (put 'allout-widgets 'custom-loads (cons '"allout-widgets" loads)))) @@ -932,7 +932,7 @@ ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) -;;;;;; "animate" "play/animate.el" (20355 10021 546955 0)) +;;;;;; "animate" "play/animate.el" (20545 57511 257469 0)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -965,7 +965,7 @@ ;;;*** ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on) -;;;;;; "ansi-color" "ansi-color.el" (20453 38823 158957 0)) +;;;;;; "ansi-color" "ansi-color.el" (20523 30501 603360 0)) ;;; Generated autoloads from ansi-color.el (autoload 'ansi-color-for-comint-mode-on "ansi-color" "\ @@ -1051,8 +1051,8 @@ ;;;### (autoloads (apropos-documentation apropos-value apropos-library ;;;;;; apropos apropos-documentation-property apropos-command apropos-variable -;;;;;; apropos-read-pattern) "apropos" "apropos.el" (20497 6436 -;;;;;; 957082 0)) +;;;;;; apropos-read-pattern) "apropos" "apropos.el" (20523 62082 +;;;;;; 997685 0)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1253,8 +1253,8 @@ ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20357 -;;;;;; 58785 834364 0)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20513 +;;;;;; 18948 537867 0)) ;;; Generated autoloads from textmodes/artist.el (autoload 'artist-mode "artist" "\ @@ -1488,7 +1488,7 @@ ;;;*** ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el" -;;;;;; (20502 24369 261101 0)) +;;;;;; (20544 36659 880486 0)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1562,7 +1562,7 @@ ;;;*** ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el" -;;;;;; (20505 550 96420 0)) +;;;;;; (20513 18948 537867 0)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1613,7 +1613,7 @@ ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (20497 6436 957082 0)) +;;;;;; (20518 12580 46478 0)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1989,8 +1989,8 @@ ;;;*** -;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (20545 +;;;;;; 57511 257469 0)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2113,7 +2113,7 @@ ;;;;;; bookmark-save bookmark-write bookmark-delete bookmark-insert ;;;;;; bookmark-rename bookmark-insert-location bookmark-relocate ;;;;;; bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark" -;;;;;; "bookmark.el" (20476 31768 298871 0)) +;;;;;; "bookmark.el" (20514 15527 107017 0)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2630,7 +2630,7 @@ ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (20479 62884 77836 0)) +;;;;;; "bs" "bs.el" (20520 54308 826101 0)) ;;; Generated autoloads from bs.el (autoload 'bs-cycle-next "bs" "\ @@ -2693,7 +2693,7 @@ ;;;*** ;;;### (autoloads (bug-reference-prog-mode bug-reference-mode) "bug-reference" -;;;;;; "progmodes/bug-reference.el" (20490 33188 850375 0)) +;;;;;; "progmodes/bug-reference.el" (20532 45476 981297 0)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2717,7 +2717,7 @@ ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) -;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20497 6436 957082 0)) +;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20522 38631 876994 556000)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -4129,8 +4129,8 @@ ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20478 3673 -;;;;;; 653810 0)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20541 60450 +;;;;;; 834170 0)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.3") @@ -4199,8 +4199,8 @@ ;;;*** -;;;### (autoloads (color-name-to-rgb) "color" "color.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (autoloads (color-name-to-rgb) "color" "color.el" (20522 9637 +;;;;;; 465791 0)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4222,7 +4222,7 @@ ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (20476 31768 298871 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4359,8 +4359,8 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook -;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20478 -;;;;;; 3673 653810 0)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20543 +;;;;;; 15782 195452 0)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4723,7 +4723,7 @@ ;;;*** ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie) -;;;;;; "cookie1" "play/cookie1.el" (20364 27900 192709 741000)) +;;;;;; "cookie1" "play/cookie1.el" (20545 57511 257469 0)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4755,8 +4755,8 @@ ;;;*** ;;;### (autoloads (copyright-update-directory copyright copyright-fix-years -;;;;;; copyright-update) "copyright" "emacs-lisp/copyright.el" (20387 -;;;;;; 44199 24128 0)) +;;;;;; copyright-update) "copyright" "emacs-lisp/copyright.el" (20518 +;;;;;; 12580 46478 0)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4795,7 +4795,7 @@ ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20490 33188 850375 +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20512 60198 306109 ;;;;;; 0)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) @@ -5014,7 +5014,7 @@ ;;;*** ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el" -;;;;;; (20476 31768 298871 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from emulation/crisp.el (defvar crisp-mode nil "\ @@ -5147,7 +5147,7 @@ ;;;;;; customize-mode customize customize-push-and-save customize-save-variable ;;;;;; customize-set-variable customize-set-value custom-menu-sort-alphabetically ;;;;;; custom-buffer-sort-alphabetically custom-browse-sort-alphabetically) -;;;;;; "cus-edit" "cus-edit.el" (20437 50597 545250 0)) +;;;;;; "cus-edit" "cus-edit.el" (20523 62082 997685 0)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5642,8 +5642,8 @@ ;;;*** -;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20476 -;;;;;; 31768 298871 0)) +;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20523 +;;;;;; 62082 997685 0)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5934,8 +5934,8 @@ ;;;*** -;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (20515 +;;;;;; 36389 544939 0)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -6032,7 +6032,7 @@ ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (20486 36135 22104 0)) +;;;;;; "descr-text.el" (20530 32114 546307 0)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -6289,7 +6289,7 @@ ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (20355 10021 546955 0)) +;;;;;; "calendar/diary-lib.el" (20530 32124 97707 678000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6376,7 +6376,7 @@ ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el" -;;;;;; (20476 31768 298871 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6420,8 +6420,8 @@ ;;;*** ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window -;;;;;; dired dired-listing-switches) "dired" "dired.el" (20486 36135 -;;;;;; 22104 0)) +;;;;;; dired dired-listing-switches) "dired" "dired.el" (20539 18737 +;;;;;; 159373 0)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6715,7 +6715,7 @@ ;;;*** ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20545 57511 257469 0)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6824,8 +6824,8 @@ ;;;*** -;;;### (autoloads (doctor) "doctor" "play/doctor.el" (20443 2992 -;;;;;; 177196 0)) +;;;### (autoloads (doctor) "doctor" "play/doctor.el" (20545 57511 +;;;;;; 257469 0)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6852,8 +6852,8 @@ ;;;*** -;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (20545 57511 +;;;;;; 257469 0)) ;;; Generated autoloads from play/dunnet.el (autoload 'dunnet "dunnet" "\ @@ -7574,7 +7574,7 @@ ;;;*** ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el" -;;;;;; (20436 29731 313079 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7657,7 +7657,7 @@ ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" -;;;;;; "emacs-lisp/edebug.el" (20497 6436 957082 0)) +;;;;;; "emacs-lisp/edebug.el" (20523 62082 997685 0)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -8319,7 +8319,7 @@ ;;;*** ;;;### (autoloads (emacs-lock-mode) "emacs-lock" "emacs-lock.el" -;;;;;; (20399 35365 4050 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8347,7 +8347,7 @@ ;;;*** ;;;### (autoloads (report-emacs-bug-query-existing-bugs report-emacs-bug) -;;;;;; "emacsbug" "mail/emacsbug.el" (20495 51111 757560 0)) +;;;;;; "emacsbug" "mail/emacsbug.el" (20523 62082 997685 0)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8800,7 +8800,7 @@ ;;;*** ;;;### (autoloads (erc-handle-irc-url erc-tls erc erc-select-read-args) -;;;;;; "erc" "erc/erc.el" (20444 23842 968143 0)) +;;;;;; "erc" "erc/erc.el" (20530 32114 546307 0)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8877,7 +8877,7 @@ ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (20439 5925 915283 0)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (20523 62082 997685 0)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -9018,7 +9018,7 @@ ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (20356 2211 532900 +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (20532 45476 981297 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) @@ -9065,7 +9065,7 @@ ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host ;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool ;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" -;;;;;; (20434 17809 692608 0)) +;;;;;; (20531 24613 995935 0)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9393,8 +9393,8 @@ ;;;*** -;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (20427 -;;;;;; 14766 970343 0)) +;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (20523 +;;;;;; 62082 997685 0)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9407,7 +9407,7 @@ ;;;*** ;;;### (autoloads (eshell-command-result eshell-command eshell) "eshell" -;;;;;; "eshell/eshell.el" (20478 3673 653810 0)) +;;;;;; "eshell/eshell.el" (20523 62082 997685 0)) ;;; Generated autoloads from eshell/eshell.el (autoload 'eshell "eshell" "\ @@ -10085,7 +10085,7 @@ ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p ;;;;;; executable-self-display executable-set-magic executable-interpret ;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20533 6181 437016 717000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -10464,7 +10464,7 @@ ;;;### (autoloads (ffap-bindings ffap-guess-file-name-at-point dired-at-point ;;;;;; ffap-at-mouse ffap-menu find-file-at-point ffap-next) "ffap" -;;;;;; "ffap.el" (20479 62884 77836 0)) +;;;;;; "ffap.el" (20542 46798 773957 0)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -11422,7 +11422,7 @@ ;;;*** ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el" -;;;;;; (20501 3499 284800 0)) +;;;;;; (20537 63402 936234 0)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11705,7 +11705,7 @@ ;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group ;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize ;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent" -;;;;;; "gnus/gnus-agent.el" (20458 56750 651721 0)) +;;;;;; "gnus/gnus-agent.el" (20518 12580 46478 0)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11796,7 +11796,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (20497 6436 957082 0)) +;;;;;; (20522 9637 465791 0)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -12191,7 +12191,7 @@ ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (20495 51111 757560 0)) +;;;;;; "gnus-msg" "gnus/gnus-msg.el" (20533 5993 500881 0)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12217,9 +12217,26 @@ ;;;*** +;;;### (autoloads (gnus-notifications) "gnus-notifications" "gnus/gnus-notifications.el" +;;;;;; (20544 36659 880486 0)) +;;; Generated autoloads from gnus/gnus-notifications.el + +(autoload 'gnus-notifications "gnus-notifications" "\ +Send a notification on new message. +This check for new messages that are in group with a level lower +or equal to `gnus-notifications-minimum-level' and send a +notification using `notifications-notify' for it. + +This is typically a function to add in +`gnus-after-getting-new-news-hook' + +\(fn)" nil nil) + +;;;*** + ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon ;;;;;; gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el" -;;;;;; (20458 56750 651721 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12246,7 +12263,7 @@ ;;;;;; gnus-sorted-nintersection gnus-sorted-range-intersection ;;;;;; gnus-sorted-intersection gnus-intersection gnus-sorted-complement ;;;;;; gnus-sorted-ndifference gnus-sorted-difference) "gnus-range" -;;;;;; "gnus/gnus-range.el" (20495 51111 757560 0)) +;;;;;; "gnus/gnus-range.el" (20544 36659 880486 0)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12314,7 +12331,7 @@ ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (20458 56750 651721 +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (20544 36659 880486 ;;;;;; 0)) ;;; Generated autoloads from gnus/gnus-registry.el @@ -12382,7 +12399,7 @@ ;;;*** ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" -;;;;;; (20495 51111 757560 0)) +;;;;;; (20540 39589 424586 0)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12394,7 +12411,7 @@ ;;;*** ;;;### (autoloads (gnus-sync-install-hooks gnus-sync-initialize) -;;;;;; "gnus-sync" "gnus/gnus-sync.el" (20465 29989 57840 0)) +;;;;;; "gnus-sync" "gnus/gnus-sync.el" (20545 57511 257469 0)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12437,8 +12454,8 @@ ;;;*** -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20545 57511 +;;;;;; 257469 0)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12705,8 +12722,8 @@ ;;;*** ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb -;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20478 3673 -;;;;;; 653810 0)) +;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20537 63402 +;;;;;; 936234 0)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12796,7 +12813,7 @@ ;;;### (autoloads (setf gv-define-simple-setter gv-define-setter ;;;;;; gv--defun-declaration gv-define-expander gv-letplace gv-get) -;;;;;; "gv" "emacs-lisp/gv.el" (20497 6436 957082 0)) +;;;;;; "gv" "emacs-lisp/gv.el" (20542 46798 773957 0)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -12852,8 +12869,9 @@ Assignments of VAL to (NAME ARGS...) are expanded by binding the argument forms (VAL ARGS...) according to ARGLIST, then executing BODY, which must return a Lisp form that does the assignment. -Actually, ARGLIST may be bound to temporary variables which are introduced -automatically to preserve proper execution order of the arguments. Example: +The first arg in ARLIST (the one that receives VAL) receives an expression +which can do arbitrary things, whereas the other arguments are all guaranteed +to be pure and copyable. Example use: (gv-define-setter aref (v a i) `(aset ,a ,i ,v)) \(fn NAME ARGLIST &rest BODY)" nil t) @@ -13108,7 +13126,7 @@ ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories ;;;;;; describe-syntax describe-variable variable-at-point describe-function-1 ;;;;;; find-lisp-object-file-name help-C-file-name describe-function) -;;;;;; "help-fns" "help-fns.el" (20497 6436 957082 0)) +;;;;;; "help-fns" "help-fns.el" (20532 45476 981297 0)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13205,7 +13223,7 @@ ;;;### (autoloads (help-bookmark-jump help-xref-on-pp help-insert-xref-button ;;;;;; help-xref-button help-make-xrefs help-buffer help-setup-xref ;;;;;; help-mode-finish help-mode-setup help-mode) "help-mode" "help-mode.el" -;;;;;; (20479 62884 77836 0)) +;;;;;; (20510 18478 782378 0)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13321,7 +13339,7 @@ ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (20478 3673 653810 0)) +;;;;;; "hexl.el" (20523 62082 997685 0)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13418,7 +13436,7 @@ ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer ;;;;;; hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer ;;;;;; global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" -;;;;;; (20410 5673 834266 0)) +;;;;;; (20522 9637 465791 0)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13427,12 +13445,19 @@ positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. -Issuing one the highlighting commands listed below will -automatically enable Hi Lock mode. To enable Hi Lock mode in all -buffers, use `global-hi-lock-mode' or add (global-hi-lock-mode 1) -to your init file. When Hi Lock mode is enabled, a \"Regexp -Highlighting\" submenu is added to the \"Edit\" menu. The -commands in the submenu, which can be called interactively, are: +Hi Lock mode is automatically enabled when you invoke any of the +highlighting commands listed below, such as \\[highlight-regexp]. +To enable Hi Lock mode in all buffers, use `global-hi-lock-mode' +or add (global-hi-lock-mode 1) to your init file. + +In buffers where Font Lock mode is enabled, patterns are +highlighted using font lock. In buffers where Font Lock mode is +disabled, patterns are applied using overlays; in this case, the +highlighting will not be updated as you type. + +When Hi Lock mode is enabled, a \"Regexp Highlighting\" submenu +is added to the \"Edit\" menu. The commands in the submenu, +which can be called interactively, are: \\[highlight-regexp] REGEXP FACE Highlight matches of pattern REGEXP in current buffer with FACE. @@ -13466,12 +13491,12 @@ rejected, the beginning of the buffer is searched for lines of the form: Hi-lock: FOO -where FOO is a list of patterns. These are added to the font lock -keywords already present. The patterns must start before position -\(number of characters into buffer) `hi-lock-file-patterns-range'. -Patterns will be read until - Hi-lock: end -is found. A mode is excluded if it's in the list `hi-lock-exclude-modes'. + +where FOO is a list of patterns. The patterns must start before +position (number of characters into buffer) +`hi-lock-file-patterns-range'. Patterns will be read until +Hi-lock: end is found. A mode is excluded if it's in the list +`hi-lock-exclude-modes'. \(fn &optional ARG)" t nil) @@ -13500,12 +13525,13 @@ (autoload 'hi-lock-line-face-buffer "hi-lock" "\ Set face of all lines containing a match of REGEXP to FACE. +Interactively, prompt for REGEXP then FACE, using a buffer-local +history list for REGEXP and a global history list for FACE. -Interactively, prompt for REGEXP then FACE. Buffer-local history -list maintained for regexps, global history maintained for faces. -\\Use \\[previous-history-element] to retrieve previous history items, -and \\[next-history-element] to retrieve default values. -\(See info node `Minibuffer History'.) +If Font Lock mode is enabled in the buffer, it is used to +highlight REGEXP. If Font Lock mode is disabled, overlays are +used for highlighting; in this case, the highlighting will not be +updated as you type. \(fn REGEXP &optional FACE)" t nil) @@ -13513,12 +13539,13 @@ (autoload 'hi-lock-face-buffer "hi-lock" "\ Set face of each match of REGEXP to FACE. +Interactively, prompt for REGEXP then FACE, using a buffer-local +history list for REGEXP and a global history list for FACE. -Interactively, prompt for REGEXP then FACE. Buffer-local history -list maintained for regexps, global history maintained for faces. -\\Use \\[previous-history-element] to retrieve previous history items, -and \\[next-history-element] to retrieve default values. -\(See info node `Minibuffer History'.) +If Font Lock mode is enabled in the buffer, it is used to +highlight REGEXP. If Font Lock mode is disabled, overlays are +used for highlighting; in this case, the highlighting will not be +updated as you type. \(fn REGEXP &optional FACE)" t nil) @@ -13526,22 +13553,22 @@ (autoload 'hi-lock-face-phrase-buffer "hi-lock" "\ Set face of each match of phrase REGEXP to FACE. - Whitespace in REGEXP converted to arbitrary whitespace and initial lower-case letters made case insensitive. +If Font Lock mode is enabled in the buffer, it is used to +highlight REGEXP. If Font Lock mode is disabled, overlays are +used for highlighting; in this case, the highlighting will not be +updated as you type. + \(fn REGEXP &optional FACE)" t nil) (defalias 'unhighlight-regexp 'hi-lock-unface-buffer) (autoload 'hi-lock-unface-buffer "hi-lock" "\ Remove highlighting of each match to REGEXP set by hi-lock. - -Interactively, prompt for REGEXP. Buffer-local history of inserted -regexp's maintained. Will accept only regexps inserted by hi-lock -interactive functions. (See `hi-lock-interactive-patterns'.) -\\Use \\[minibuffer-complete] to complete a partially typed regexp. -\(See info node `Minibuffer History'.) +Interactively, prompt for REGEXP, accepting only regexps +previously inserted by hi-lock interactive functions. \(fn REGEXP)" t nil) @@ -13557,7 +13584,7 @@ ;;;*** ;;;### (autoloads (hide-ifdef-mode) "hideif" "progmodes/hideif.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20541 6907 775259 0)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13601,7 +13628,7 @@ ;;;*** ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (20356 55829 180242 0)) +;;;;;; (20541 6907 775259 0)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13929,7 +13956,7 @@ ;;;;;; holiday-bahai-holidays holiday-islamic-holidays holiday-christian-holidays ;;;;;; holiday-hebrew-holidays holiday-other-holidays holiday-local-holidays ;;;;;; holiday-oriental-holidays holiday-general-holidays) "holidays" -;;;;;; "calendar/holidays.el" (20390 20388 254308 0)) +;;;;;; "calendar/holidays.el" (20530 32124 107724 973000)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -14212,7 +14239,7 @@ ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (20479 62884 77836 0)) +;;;;;; "ibuffer" "ibuffer.el" (20542 46798 773957 0)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14823,7 +14850,7 @@ ;;;;;; create-image image-type-auto-detected-p image-type-available-p ;;;;;; image-type image-type-from-file-name image-type-from-file-header ;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" -;;;;;; (20437 50597 545250 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15270,7 +15297,7 @@ ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (20476 31768 298871 +;;;;;; imenu-sort-function) "imenu" "imenu.el" (20511 39332 974340 ;;;;;; 0)) ;;; Generated autoloads from imenu.el @@ -15292,16 +15319,39 @@ (custom-autoload 'imenu-sort-function "imenu" t) (defvar imenu-generic-expression nil "\ -The regex pattern to use for creating a buffer index. +List of definition matchers for creating an Imenu index. +Each element of this list should have the form + + (MENU-TITLE REGEXP INDEX [FUNCTION] [ARGUMENTS...]) + +MENU-TITLE should be nil (in which case the matches for this +element are put in the top level of the buffer index) or a +string (which specifies the title of a submenu into which the +matches are put). +REGEXP is a regular expression matching a definition construct +which is to be displayed in the menu. REGEXP may also be a +function, called without arguments. It is expected to search +backwards. It must return true and set `match-data' if it finds +another element. +INDEX is an integer specifying which subexpression of REGEXP +matches the definition's name; this subexpression is displayed as +the menu item. +FUNCTION, if present, specifies a function to call when the index +item is selected by the user. This function is called with +arguments consisting of the item name, the buffer position, and +the ARGUMENTS. + +The variable `imenu-case-fold-search' determines whether or not +the regexp matches are case sensitive, and `imenu-syntax-alist' +can be used to alter the syntax table for the search. If non-nil this pattern is passed to `imenu--generic-function' to -create a buffer index. Look there for the documentation of this -pattern's structure. +create a buffer index. -For example, see the value of `fortran-imenu-generic-expression' used by -`fortran-mode' with `imenu-syntax-alist' set locally to give the -characters which normally have \"symbol\" syntax \"word\" syntax -during matching.") +For example, see the value of `fortran-imenu-generic-expression' +used by `fortran-mode' with `imenu-syntax-alist' set locally to +give the characters which normally have \"symbol\" syntax +\"word\" syntax during matching.") (put 'imenu-generic-expression 'risky-local-variable t) (make-variable-buffer-local 'imenu-generic-expression) @@ -15487,7 +15537,7 @@ ;;;;;; Info-goto-emacs-key-command-node Info-goto-emacs-command-node ;;;;;; Info-mode info-finder info-apropos Info-index Info-directory ;;;;;; Info-on-current-buffer info-standalone info-emacs-bug info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (20476 31768 298871 +;;;;;; info info-other-window) "info" "info.el" (20540 39589 424586 ;;;;;; 0)) ;;; Generated autoloads from info.el @@ -16375,7 +16425,7 @@ ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20478 3673 653810 +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20532 45476 981297 ;;;;;; 0)) ;;; Generated autoloads from progmodes/js.el @@ -16619,7 +16669,7 @@ ;;;*** ;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el" -;;;;;; (20478 3673 653810 0)) +;;;;;; (20545 57511 257469 0)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16776,7 +16826,7 @@ ;;;*** -;;;### (autoloads (life) "life" "play/life.el" (20355 10021 546955 +;;;### (autoloads (life) "life" "play/life.el" (20545 57511 257469 ;;;;;; 0)) ;;; Generated autoloads from play/life.el @@ -16953,8 +17003,8 @@ ;;;*** -;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (20477 -;;;;;; 21160 227853 0)) +;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (20515 +;;;;;; 36389 544939 0)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -17618,7 +17668,7 @@ ;;;*** ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el" -;;;;;; (20504 6781 423358 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17729,7 +17779,7 @@ ;;;;;; message-forward-make-body message-forward message-recover ;;;;;; message-supersede message-cancel-news message-followup message-wide-reply ;;;;;; message-reply message-news message-mail message-mode) "message" -;;;;;; "gnus/message.el" (20501 3499 284800 0)) +;;;;;; "gnus/message.el" (20545 57511 257469 0)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -18204,7 +18254,7 @@ ;;;*** ;;;### (autoloads (list-dynamic-libraries butterfly) "misc" "misc.el" -;;;;;; (20356 27828 24951 0)) +;;;;;; (20533 5993 500881 0)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18606,7 +18656,7 @@ ;;;*** -;;;### (autoloads (mpc) "mpc" "mpc.el" (20476 31768 298871 0)) +;;;### (autoloads (mpc) "mpc" "mpc.el" (20523 62082 997685 0)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18616,7 +18666,7 @@ ;;;*** -;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (20434 17809 692608 +;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (20545 57511 257469 ;;;;;; 0)) ;;; Generated autoloads from play/mpuz.el @@ -19309,7 +19359,7 @@ ;;;*** ;;;### (autoloads (nxml-glyph-display-string) "nxml-glyph" "nxml/nxml-glyph.el" -;;;;;; (20439 5925 915283 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -20901,7 +20951,7 @@ ;;;### (autoloads (org-id-store-link org-id-find-id-file org-id-find ;;;;;; org-id-goto org-id-get-with-outline-drilling org-id-get-with-outline-path-completion ;;;;;; org-id-get org-id-copy org-id-get-create) "org-id" "org/org-id.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20545 57511 257469 0)) ;;; Generated autoloads from org/org-id.el (autoload 'org-id-get-create "org-id" "\ @@ -21620,8 +21670,8 @@ ;;;*** -;;;### (autoloads (show-paren-mode) "paren" "paren.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (autoloads (show-paren-mode) "paren" "paren.el" (20542 50478 +;;;;;; 439878 507000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -21859,8 +21909,8 @@ ;;;*** -;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (20453 -;;;;;; 5408 87415 759000)) +;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (20523 +;;;;;; 62082 997685 0)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -21930,8 +21980,8 @@ ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list ;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete -;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20476 -;;;;;; 31768 298871 0)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20523 +;;;;;; 62082 997685 0)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -22075,7 +22125,7 @@ ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (20478 3673 653810 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -22931,17 +22981,20 @@ ;;;*** -;;;### (autoloads (proced) "proced" "proced.el" (20453 5437 764254 +;;;### (autoloads (proced) "proced" "proced.el" (20511 39332 974340 ;;;;;; 0)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ Generate a listing of UNIX system processes. -If invoked with optional ARG the window displaying the process -information will be displayed but not selected. -Runs the normal hook `proced-post-display-hook'. - -See `proced-mode' for a description of features available in Proced buffers. +\\ +If invoked with optional ARG, do not select the window displaying +the process information. + +This function runs the normal hook `proced-post-display-hook'. + +See `proced-mode' for a description of features available in +Proced buffers. \(fn &optional ARG)" t nil) @@ -23245,7 +23298,7 @@ ;;;*** ;;;### (autoloads (python-mode run-python) "python" "progmodes/python.el" -;;;;;; (20504 35072 130543 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from progmodes/python.el (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) @@ -23281,7 +23334,7 @@ ;;;*** ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20544 36659 880486 0)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -23304,7 +23357,7 @@ ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (20501 3499 284800 0)) +;;;;;; "international/quail.el" (20523 62082 997685 0)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -23608,7 +23661,7 @@ ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (20434 17809 692608 0)) +;;;;;; "net/rcirc.el" (20541 6907 775259 0)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -23864,8 +23917,8 @@ ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20499 48164 -;;;;;; 310488 0)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20507 42276 +;;;;;; 222255 0)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -24013,8 +24066,8 @@ ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (20498 -;;;;;; 27300 867875 0)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (20507 +;;;;;; 42276 222255 0)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -24024,7 +24077,7 @@ ;;;*** ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el" -;;;;;; (20363 61861 222722 0)) +;;;;;; (20522 38650 757441 0)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -24270,8 +24323,8 @@ ;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers ;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers ;;;;;; rmail-user-mail-address-regexp rmail-movemail-variant-p rmail-spool-directory -;;;;;; rmail-file-name) "rmail" "mail/rmail.el" (20437 50597 545250 -;;;;;; 0)) +;;;;;; rmail-file-name) "rmail" "mail/rmail.el" (20526 43809 637014 +;;;;;; 858000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -24469,8 +24522,8 @@ ;;;*** ;;;### (autoloads (rmail-output-body-to-file rmail-output-as-seen -;;;;;; rmail-output) "rmailout" "mail/rmailout.el" (20355 10021 -;;;;;; 546955 0)) +;;;;;; rmail-output) "rmailout" "mail/rmailout.el" (20530 3765 184907 +;;;;;; 0)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -24619,7 +24672,7 @@ ;;;*** ;;;### (autoloads (robin-use-package robin-modify-package robin-define-package) -;;;;;; "robin" "international/robin.el" (20501 3499 284800 0)) +;;;;;; "robin" "international/robin.el" (20523 62082 997685 0)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -24691,7 +24744,7 @@ ;;;*** ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el" -;;;;;; (20502 63903 34842 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -24722,7 +24775,7 @@ ;;;*** ;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el" -;;;;;; (20490 33188 850375 0)) +;;;;;; (20522 38650 757441 0)) ;;; Generated autoloads from progmodes/ruby-mode.el (autoload 'ruby-mode "ruby-mode" "\ @@ -24761,8 +24814,8 @@ ;;;*** -;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (20518 +;;;;;; 12580 46478 0)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -25073,8 +25126,8 @@ ;;;*** -;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (20453 -;;;;;; 5437 764254 0)) +;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (20523 +;;;;;; 62082 997685 0)) ;;; Generated autoloads from savehist.el (defvar savehist-mode nil "\ @@ -25549,8 +25602,8 @@ ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-force-delete server-start) "server" "server.el" (20478 -;;;;;; 3673 653810 0)) +;;;;;; server-force-delete server-start) "server" "server.el" (20545 +;;;;;; 57511 257469 0)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -25702,7 +25755,7 @@ ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (20487 57003 603251 0)) +;;;;;; (20541 6907 775259 0)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -26010,7 +26063,7 @@ ;;;*** ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new -;;;;;; define-skeleton) "skeleton" "skeleton.el" (20406 8611 875037 +;;;;;; define-skeleton) "skeleton" "skeleton.el" (20541 6907 775259 ;;;;;; 0)) ;;; Generated autoloads from skeleton.el @@ -26123,7 +26176,7 @@ ;;;*** ;;;### (autoloads (smerge-start-session smerge-mode smerge-ediff) -;;;;;; "smerge-mode" "vc/smerge-mode.el" (20476 31768 298871 0)) +;;;;;; "smerge-mode" "vc/smerge-mode.el" (20523 62082 997685 0)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -26332,7 +26385,7 @@ ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields ;;;;;; sort-fields sort-numeric-fields sort-pages sort-paragraphs -;;;;;; sort-lines sort-subr) "sort" "sort.el" (20355 10021 546955 +;;;;;; sort-lines sort-subr) "sort" "sort.el" (20507 42276 222255 ;;;;;; 0)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -26430,18 +26483,23 @@ \(fn FIELD BEG END)" t nil) (autoload 'sort-regexp-fields "sort" "\ -Sort the region lexicographically as specified by RECORD-REGEXP and KEY. -RECORD-REGEXP specifies the textual units which should be sorted. - For example, to sort lines RECORD-REGEXP would be \"^.*$\" -KEY specifies the part of each record (ie each match for RECORD-REGEXP) - is to be used for sorting. - If it is \"\\\\digit\" then the digit'th \"\\\\(...\\\\)\" match field from - RECORD-REGEXP is used. - If it is \"\\\\&\" then the whole record is used. - Otherwise, it is a regular-expression for which to search within the record. -If a match for KEY is not found within a record then that record is ignored. - -With a negative prefix arg sorts in reverse order. +Sort the text in the region region lexicographically. +If called interactively, prompt for two regular expressions, +RECORD-REGEXP and KEY-REGEXP. + +RECORD-REGEXP specifies the textual units to be sorted. + For example, to sort lines, RECORD-REGEXP would be \"^.*$\". + +KEY-REGEXP specifies the part of each record (i.e. each match for + RECORD-REGEXP) to be used for sorting. + If it is \"\\\\digit\", use the digit'th \"\\\\(...\\\\)\" + match field specified by RECORD-REGEXP. + If it is \"\\\\&\", use the whole record. + Otherwise, KEY-REGEXP should be a regular expression with which + to search within the record. If a match for KEY-REGEXP is not + found within a record, that record is ignored. + +With a negative prefix arg, sort in reverse order. The variable `sort-fold-case' determines whether alphabetic case affects the sort order. @@ -27117,8 +27175,8 @@ ;;;;;; strokes-mode strokes-list-strokes strokes-load-user-strokes ;;;;;; strokes-help strokes-describe-stroke strokes-do-complex-stroke ;;;;;; strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke -;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (20478 -;;;;;; 3673 653810 0)) +;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (20523 +;;;;;; 62082 997685 0)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -27253,7 +27311,7 @@ ;;;*** ;;;### (autoloads (global-subword-mode subword-mode) "subword" "progmodes/subword.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20524 51365 2559 0)) ;;; Generated autoloads from progmodes/subword.el (autoload 'subword-mode "subword" "\ @@ -28010,8 +28068,8 @@ ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20478 3673 -;;;;;; 653810 0)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20522 9637 +;;;;;; 465791 0)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -28200,8 +28258,8 @@ ;;;*** -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (20478 3673 -;;;;;; 653810 0)) +;;;### (autoloads (tetris) "tetris" "play/tetris.el" (20545 57511 +;;;;;; 257469 0)) ;;; Generated autoloads from play/tetris.el (autoload 'tetris "tetris" "\ @@ -28232,7 +28290,7 @@ ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (20485 15269 390836 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -29114,7 +29172,7 @@ ;;;;;; timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out ;;;;;; timeclock-change timeclock-status-string timeclock-out timeclock-in ;;;;;; timeclock-mode-line-display) "timeclock" "calendar/timeclock.el" -;;;;;; (20427 14766 970343 0)) +;;;;;; (20523 62082 997685 0)) ;;; Generated autoloads from calendar/timeclock.el (autoload 'timeclock-mode-line-display "timeclock" "\ @@ -29524,7 +29582,7 @@ ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" -;;;;;; "net/tramp.el" (20471 14012 248888 0)) +;;;;;; "net/tramp.el" (20530 32114 546307 0)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -29667,8 +29725,8 @@ ;;;*** -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20369 -;;;;;; 14251 85829 0)) +;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20518 +;;;;;; 12580 46478 0)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -29755,7 +29813,7 @@ ;;;;;; type-break type-break-mode type-break-keystroke-threshold ;;;;;; type-break-good-break-interval type-break-good-rest-interval ;;;;;; type-break-interval type-break-mode) "type-break" "type-break.el" -;;;;;; (20355 10021 546955 0)) +;;;;;; (20545 57511 257469 0)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -30320,7 +30378,7 @@ ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (20478 3673 653810 +;;;;;; url-http) "url-http" "url/url-http.el" (20522 38650 757441 ;;;;;; 0)) ;;; Generated autoloads from url/url-http.el @@ -30523,7 +30581,7 @@ ;;;*** ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse" -;;;;;; "url/url-parse.el" (20478 3673 653810 0)) +;;;;;; "url/url-parse.el" (20523 62082 997685 0)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -30606,8 +30664,8 @@ ;;;;;; url-percentage url-display-percentage url-pretty-length url-strip-leading-spaces ;;;;;; url-eat-trailing-space url-get-normalized-date url-lazy-message ;;;;;; url-normalize-url url-insert-entities-in-string url-parse-args -;;;;;; url-debug url-debug) "url-util" "url/url-util.el" (20478 -;;;;;; 3673 653810 0)) +;;;;;; url-debug url-debug) "url-util" "url/url-util.el" (20520 +;;;;;; 54308 826101 0)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -30867,8 +30925,8 @@ ;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers ;;;;;; vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff ;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook -;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20501 -;;;;;; 3499 284800 0)) +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20542 +;;;;;; 46798 773957 0)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -31211,7 +31269,7 @@ ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20478 3673 653810 +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20542 46798 773957 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) @@ -31223,7 +31281,7 @@ ;;;*** -;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20478 3673 653810 +;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20522 9637 465791 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-dir.el @@ -31295,8 +31353,7 @@ ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20478 3673 653810 -;;;;;; 0)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20524 51365 2559 0)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -32468,8 +32525,8 @@ ;;;*** -;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (20355 -;;;;;; 10021 546955 0)) +;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (20513 +;;;;;; 18948 537867 0)) ;;; Generated autoloads from emulation/vip.el (autoload 'vip-setup "vip" "\ @@ -32592,15 +32649,16 @@ ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (20478 3673 653810 0)) +;;;;;; (20510 18478 782378 0)) ;;; Generated autoloads from wdired.el (autoload 'wdired-change-to-wdired-mode "wdired" "\ -Put a dired buffer in a mode in which filenames are editable. +Put a Dired buffer in Writable Dired (WDired) mode. \\ -This mode allows the user to change the names of the files, and after -typing \\[wdired-finish-edit] Emacs renames the files and directories -in disk. +In WDired mode, you can edit the names of the files in the +buffer, the target of the links, and the permission bits of the +files. After typing \\[wdired-finish-edit], Emacs modifies the files and +directories to reflect your edits. See `wdired-mode'. @@ -32626,7 +32684,7 @@ ;;;*** ;;;### (autoloads (which-function-mode which-func-mode) "which-func" -;;;;;; "progmodes/which-func.el" (20461 32935 300400 0)) +;;;;;; "progmodes/which-func.el" (20523 62082 997685 0)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -32662,8 +32720,8 @@ ;;;### (autoloads (whitespace-report-region whitespace-report whitespace-cleanup-region ;;;;;; whitespace-cleanup global-whitespace-toggle-options whitespace-toggle-options ;;;;;; global-whitespace-newline-mode global-whitespace-mode whitespace-newline-mode -;;;;;; whitespace-mode) "whitespace" "whitespace.el" (20495 51111 -;;;;;; 757560 0)) +;;;;;; whitespace-mode) "whitespace" "whitespace.el" (20508 13724 +;;;;;; 260761 0)) ;;; Generated autoloads from whitespace.el (autoload 'whitespace-mode "whitespace" "\ @@ -33209,7 +33267,7 @@ ;;;*** ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file -;;;;;; woman woman-locale) "woman" "woman.el" (20504 6781 423358 +;;;;;; woman woman-locale) "woman" "woman.el" (20539 18737 159373 ;;;;;; 0)) ;;; Generated autoloads from woman.el @@ -33392,7 +33450,7 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (20499 48164 310488 0)) +;;;;;; (20528 48420 241677 0)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -33540,7 +33598,7 @@ ;;;*** -;;;### (autoloads (zone) "zone" "play/zone.el" (20427 14766 970343 +;;;### (autoloads (zone) "zone" "play/zone.el" (20545 57511 257469 ;;;;;; 0)) ;;; Generated autoloads from play/zone.el @@ -33752,7 +33810,7 @@ ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-fns.el" -;;;;;; "w32-vars.el" "x-dnd.el") (20505 765 716386 793000)) +;;;;;; "w32-vars.el" "x-dnd.el") (20545 57718 475744 538000)) ;;;*** ------------------------------------------------------------ revno: 109839 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-09-01 06:17:31 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2012-08-28 16:01:59 +0000 +++ autogen/Makefile.in 2012-09-01 10:17:31 +0000 @@ -755,6 +755,7 @@ WIDGET_OBJ = @WIDGET_OBJ@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOW_SYSTEM_OBJ = @WINDOW_SYSTEM_OBJ@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XFT_CFLAGS = @XFT_CFLAGS@ XFT_LIBS = @XFT_LIBS@ === modified file 'autogen/config.in' --- autogen/config.in 2012-08-25 10:17:28 +0000 +++ autogen/config.in 2012-09-01 10:17:31 +0000 @@ -1345,6 +1345,9 @@ /* Define to 1 if you use terminfo instead of termcap. */ #undef TERMINFO +/* Define to the header for the built-in window system. */ +#undef TERM_HEADER + /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME === modified file 'autogen/configure' --- autogen/configure 2012-08-28 16:01:59 +0000 +++ autogen/configure 2012-09-01 10:17:31 +0000 @@ -604,6 +604,7 @@ LTLIBOBJS LIBOBJS SUBDIR_MAKEFILES_IN +WINDOW_SYSTEM_OBJ LIB_GCC LD_FIRSTFLAG LD_SWITCH_SYSTEM_TEMACS @@ -9149,6 +9150,12 @@ #### Choose a window system. +## We leave window_system equal to none if +## we end up building without one. Any new window system should +## set window_system to an appropriate value and add objects to +## window-system-specific substs. + +window_system=none { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } @@ -9342,9 +9349,7 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi -if test "$no_x" = yes; then - window_system=none -else +if test "$no_x" != yes; then window_system=x11 fi @@ -9519,7 +9524,6 @@ fi window_system=nextstep - with_xft=no # set up packaging dirs if test "${EN_NS_SELF_CONTAINED}" = yes; then ns_self_contained=yes @@ -9536,7 +9540,6 @@ INSTALL_ARCH_INDEP_EXTRA= fi ns_frag=$srcdir/src/ns.mk - NS_OBJ="fontset.o fringe.o image.o" NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" fi CFLAGS="$tmp_CFLAGS" @@ -9548,28 +9551,45 @@ +## $window_system is now set to the window system we will +## ultimately use. + +term_header= +HAVE_X_WINDOWS=no +HAVE_X11=no +USE_X_TOOLKIT=none + case "${window_system}" in x11 ) HAVE_X_WINDOWS=yes HAVE_X11=yes + term_header=xterm.h case "${with_x_toolkit}" in athena | lucid ) USE_X_TOOLKIT=LUCID ;; motif ) USE_X_TOOLKIT=MOTIF ;; gtk ) with_gtk=yes + term_header=gtkutil.h USE_X_TOOLKIT=none ;; gtk3 ) with_gtk3=yes + term_header=gtkutil.h USE_X_TOOLKIT=none ;; no ) USE_X_TOOLKIT=none ;; * ) USE_X_TOOLKIT=maybe ;; esac ;; - nextstep | none ) - HAVE_X_WINDOWS=no - HAVE_X11=no - USE_X_TOOLKIT=none + nextstep ) + term_header=nsterm.h ;; esac +if test -n "${term_header}"; then + +cat >>confdefs.h <<_ACEOF +#define TERM_HEADER "${term_header}" +_ACEOF + +fi + if test "$window_system" = none && test "X$with_x" != "Xno"; then # Extract the first word of "X", so it can be a program name with args. set dummy X; ac_word=$2 @@ -10561,6 +10581,7 @@ $as_echo "#define HAVE_GTK3 1" >>confdefs.h GTK_OBJ=emacsgtkfixed.o + term_header=gtkutil.h fi if test "$pkg_check_gtk" != "yes"; then @@ -10723,6 +10744,8 @@ fi done + + term_header=gtkutil.h fi HAVE_DBUS=no @@ -15643,6 +15666,14 @@ +if test -n "${term_header}"; then + +cat >>confdefs.h <<_ACEOF +#define TERM_HEADER "${term_header}" +_ACEOF + +fi + cat >>confdefs.h <<_ACEOF #define EMACS_CONFIGURATION "${canonical}" @@ -15663,7 +15694,7 @@ $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h XMENU_OBJ=xmenu.o - XOBJ="xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o xsettings.o xgselect.o" + XOBJ="xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o xgselect.o" FONT_OBJ=xfont.o if test "$HAVE_XFT" = "yes"; then FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" @@ -24070,20 +24101,21 @@ esac fi - -## If we're using X11/GNUstep, define some consequences. -if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then +## Common for all window systems +if test "$window_system" != "none"; then $as_echo "#define HAVE_WINDOW_SYSTEM 1" >>confdefs.h $as_echo "#define HAVE_MOUSE 1" >>confdefs.h + WINDOW_SYSTEM_OBJ="fontset.o fringe.o image.o" fi + #### Report on what we decided to do. #### Report GTK as a toolkit, even if it doesn't use Xt. #### It makes printing result more understandable as using GTK sets ------------------------------------------------------------ revno: 109838 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2012-09-01 12:29:17 +0300 message: Fix last changes related to w32 and Cygwin. src/image.c: Restore mistakenly removed inclusion of w32.h. Without it, GCC doesn't see prototypes of w32_delayed_load, and complains about implicit conversions from integer to pointer. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-01 08:22:10 +0000 +++ src/ChangeLog 2012-09-01 09:29:17 +0000 @@ -1,3 +1,9 @@ +2012-09-01 Eli Zaretskii + + * image.c: Restore mistakenly removed inclusion of w32.h. Without + it, GCC doesn't see prototypes of w32_delayed_load, and complains + about implicit conversions from integer to pointer. + 2012-09-01 Daniel Colascione * w32fns.c (x_display_info_for_name): Prevent crash if w32 window === modified file 'src/image.c' --- src/image.c 2012-09-01 06:38:52 +0000 +++ src/image.c 2012-09-01 09:29:17 +0000 @@ -76,6 +76,7 @@ #endif /* HAVE_X_WINDOWS */ #ifdef HAVE_NTGUI +#include "w32.h" /* W32_TODO : Color tables on W32. */ #undef COLOR_TABLE_SUPPORT ------------------------------------------------------------ revno: 109837 committer: Daniel Colascione branch nick: trunk timestamp: Sat 2012-09-01 00:22:10 -0800 message: Prevent crash if w32 used before it's initialized diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-01 08:01:36 +0000 +++ src/ChangeLog 2012-09-01 08:22:10 +0000 @@ -1,3 +1,8 @@ +2012-09-01 Daniel Colascione + + * w32fns.c (x_display_info_for_name): Prevent crash if w32 window + system used too early. + 2012-09-01 Paul Eggert Better seed support for (random). === modified file 'src/w32fns.c' --- src/w32fns.c 2012-08-18 06:06:39 +0000 +++ src/w32fns.c 2012-09-01 08:22:10 +0000 @@ -4735,7 +4735,7 @@ CHECK_STRING (name); for (dpyinfo = &one_w32_display_info, names = w32_display_name_list; - dpyinfo; + dpyinfo && !NILP (w32_display_name_list); dpyinfo = dpyinfo->next, names = XCDR (names)) { Lisp_Object tem; ------------------------------------------------------------ revno: 109836 [merge] committer: dancol@dancol.org branch nick: realtrunk timestamp: Sat 2012-09-01 00:01:36 -0800 message: Merge from cygw32 branch diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-28 16:01:59 +0000 +++ ChangeLog 2012-09-01 06:38:52 +0000 @@ -1,3 +1,11 @@ +2012-09-01 Daniel Colascione + + * configure.ac: Introduce term_header variable, which holds the + value which will become TERM_HEADER in code. We effect our choice + of window system by setting term_header and WINDOW_SYSTEM_OBJ + instead of using ad-hoc variables and flags for each window + system. + 2012-08-26 Paul Eggert * configure.ac (CFLAGS): Prefer -g3 to -g if -g3 works === modified file 'configure.ac' --- configure.ac 2012-08-28 16:01:59 +0000 +++ configure.ac 2012-09-01 06:38:52 +0000 @@ -1386,10 +1386,14 @@ #### Choose a window system. +## We leave window_system equal to none if +## we end up building without one. Any new window system should +## set window_system to an appropriate value and add objects to +## window-system-specific substs. + +window_system=none AC_PATH_X -if test "$no_x" = yes; then - window_system=none -else +if test "$no_x" != yes; then window_system=x11 fi @@ -1528,7 +1532,6 @@ fi window_system=nextstep - with_xft=no # set up packaging dirs if test "${EN_NS_SELF_CONTAINED}" = yes; then ns_self_contained=yes @@ -1548,7 +1551,6 @@ INSTALL_ARCH_INDEP_EXTRA= fi ns_frag=$srcdir/src/ns.mk - NS_OBJ="fontset.o fringe.o image.o" NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" fi CFLAGS="$tmp_CFLAGS" @@ -1560,18 +1562,29 @@ AC_SUBST(LIB_STANDARD) AC_SUBST_FILE(ns_frag) +## $window_system is now set to the window system we will +## ultimately use. + +term_header= +HAVE_X_WINDOWS=no +HAVE_X11=no +USE_X_TOOLKIT=none + case "${window_system}" in x11 ) HAVE_X_WINDOWS=yes HAVE_X11=yes + term_header=xterm.h case "${with_x_toolkit}" in athena | lucid ) USE_X_TOOLKIT=LUCID ;; motif ) USE_X_TOOLKIT=MOTIF ;; gtk ) with_gtk=yes + term_header=gtkutil.h dnl Don't set this for GTK. A lot of tests below assumes Xt when dnl USE_X_TOOLKIT is set. USE_X_TOOLKIT=none ;; gtk3 ) with_gtk3=yes + term_header=gtkutil.h USE_X_TOOLKIT=none ;; no ) USE_X_TOOLKIT=none ;; dnl If user did not say whether to use a toolkit, make this decision later: @@ -1579,13 +1592,16 @@ * ) USE_X_TOOLKIT=maybe ;; esac ;; - nextstep | none ) - HAVE_X_WINDOWS=no - HAVE_X11=no - USE_X_TOOLKIT=none + nextstep ) + term_header=nsterm.h ;; esac +if test -n "${term_header}"; then + AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}", + [Define to the header for the built-in window system.]) +fi + if test "$window_system" = none && test "X$with_x" != "Xno"; then AC_CHECK_PROG(HAVE_XSERVER, X, true, false) if test "$HAVE_XSERVER" = true || @@ -1901,6 +1917,7 @@ fi AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.]) GTK_OBJ=emacsgtkfixed.o + term_header=gtkutil.h fi if test "$pkg_check_gtk" != "yes"; then @@ -1979,6 +1996,8 @@ gtk_widget_get_mapped gtk_adjustment_get_page_size \ gtk_orientable_set_orientation \ gtk_window_set_has_resize_grip) + + term_header=gtkutil.h fi dnl D-Bus has been tested under GNU/Linux only. Must be adapted for @@ -3973,6 +3992,11 @@ AC_SUBST(GNU_OBJC_CFLAGS) AC_SUBST(OTHER_FILES) +if test -n "${term_header}"; then + AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}", + [Define to the header for the built-in window system.]) +fi + AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", [Define to the canonical Emacs configuration name.]) AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}", @@ -3987,7 +4011,7 @@ AC_DEFINE(HAVE_X_WINDOWS, 1, [Define to 1 if you want to use the X window system.]) XMENU_OBJ=xmenu.o - XOBJ="xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o xsettings.o xgselect.o" + XOBJ="xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o xgselect.o" FONT_OBJ=xfont.o if test "$HAVE_XFT" = "yes"; then FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" @@ -4277,13 +4301,14 @@ fi dnl if $GCC AC_SUBST(LIB_GCC) - -## If we're using X11/GNUstep, define some consequences. -if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then +## Common for all window systems +if test "$window_system" != "none"; then AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.]) AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.]) + WINDOW_SYSTEM_OBJ="fontset.o fringe.o image.o" fi +AC_SUBST(WINDOW_SYSTEM_OBJ) AH_TOP([/* GNU Emacs site configuration template file. === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-08-28 16:01:59 +0000 +++ nt/ChangeLog 2012-09-01 06:38:52 +0000 @@ -1,3 +1,7 @@ +2012-09-01 Daniel Colascione + + * inc/ms-w32.h (TERM_HEADER): Add for refactoring + 2012-08-22 Juanma Barranquero * config.nt: Sync with autogen/config.in. === modified file 'nt/inc/ms-w32.h' --- nt/inc/ms-w32.h 2012-08-07 11:03:48 +0000 +++ nt/inc/ms-w32.h 2012-09-01 06:38:52 +0000 @@ -424,4 +424,7 @@ #define DebPrint(stuff) #endif +#define TERM_HEADER "w32term.h" + + /* ============================================================ */ === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-01 01:04:26 +0000 +++ src/ChangeLog 2012-09-01 08:01:36 +0000 @@ -7,6 +7,78 @@ * lisp.h, sysdep.c (seed_random): Now takes address and size, not long. (init_random): New function. +2012-09-01 Daniel Colascione + + * xterm.h: Add header guards. Declare x_menubar_window_to_frame. + Remove x_set_frame_alpha, x_bitmap_icon, x_make_frame_visible, + x_make_frame_invisible, x_iconify_frame, x_free_frame_resources, + x_wm_set_size_hint, x_query_colors, x_real_positions, + x_set_menu_bar_lines, x_char_width, x_char_height, x_sync, + x_set_tool_bar_lines, x_activate_menubar, and free_frame_menubar, + all of which have been moved to common code. + + * xfaces.c: Include TERM_HEADER instead of listing all possible + window-system headers. + + * w32xfns.c (x_sync): Correct definition of x_sync (a no-op here) + to match header. + + * w32term.h (FRAME_X_WINDOW): Use FRAME_W32_WINDOW instead of + directly accessing frame internals. + + * w32font.h (w): Include font.h. Define syms_of_w32font and + globals_of_w32font. + + * process.c: Include TERM_HEADER instead of listing all possible + window-system headers. + + * nsterm.h: Remove declarations now in frame.h. Define + FRAME_X_SCREEN, FRAME_X_VISUAL. + + * menu.c: Include TERM_HEADER instead of listing all possible + window-system headers. + + * keyboard.h: Declare ignore_mouse_drag_p whenever we have a + window system. + + * keyboard.c: Include TERM_HEADER instead of listing all possible + window-system headers. + + * image.c: Include TERM_HEADER instead of listing all possible + window-system headers. Declare Vlibrary_cache when compiling for + Windows. + + * gtkutil.h (xg_list_node_): Include xterm.h to pick up needed + window system declarations. + + * frame.h: Move common functions here: set_frame_menubar, + x_set_window_size, x_sync, x_get_focus_frame, + x_set_mouse_position, x_set_mouse_pixel_position, + x_make_frame_visible, x_make_frame_invisible, x_iconify_frame, + x_char_width, x_char_height, x_pixel_width, x_pixel_height, + x_set_frame_alpha, x_set_menu_bar_lines, x_set_tool_bar_lines, + x_activate_menubar, x_real_positions, x_bitmap_icon, + x_set_menu_bar_lines, free_frame_menubar, x_free_frame_resources, + and x_query_colors. + + * frame.c: Include TERM_HEADER instead of listing all possible + window-system headers. + + * font.c: Include TERM_HEADER instead of listing all possible + window-system headers. + + * emacs.c: Include TERM_HEADER. + + * dispnew.c (d): Include TERM_HEADER instead of listing all + possible window-system headers. + + * ccl.h (c): Include character.h. + + * Makefile.in: Define WINDOW_SYSTEM_OBJ to hold objects needed for + the current window system; include in list of objects to link into + Emacs. +>>>>>>> MERGE-SOURCE + 2012-08-31 Dmitry Antipov Remove mark_ttys function and fix tty_display_info initialization. === modified file 'src/Makefile.in' --- src/Makefile.in 2012-08-26 10:29:37 +0000 +++ src/Makefile.in 2012-09-01 06:38:52 +0000 @@ -211,8 +211,8 @@ ## xmenu.o if HAVE_X_WINDOWS, else empty. XMENU_OBJ=@XMENU_OBJ@ -## xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o -## xsettings.o xgselect.o if HAVE_X_WINDOWS, else empty. +## xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o xgselect.o if +## HAVE_X_WINDOWS, else empty. XOBJ=@XOBJ@ TOOLKIT_LIBW=@TOOLKIT_LIBW@ @@ -247,6 +247,9 @@ ## sheap.o if CYGWIN, otherwise empty. CYGWIN_OBJ=@CYGWIN_OBJ@ +## fontset.o fringe.o image.o if we have any window system +WINDOW_SYSTEM_OBJ=@WINDOW_SYSTEM_OBJ@ + ## dosfns.o msdos.o w16select.o if MSDOS. MSDOS_OBJ = ## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS. @@ -255,7 +258,6 @@ ns_appdir=@ns_appdir@ ns_appbindir=@ns_appbindir@ ns_appsrc=@ns_appsrc@ -## fontset.o fringe.o image.o if HAVE_NS, else empty. NS_OBJ=@NS_OBJ@ ## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o if HAVE_NS. NS_OBJC_OBJ=@NS_OBJC_OBJ@ @@ -340,7 +342,8 @@ process.o gnutls.o callproc.o \ region-cache.o sound.o atimer.o \ doprnt.o intervals.o textprop.o composite.o xml.o \ - $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) + $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \ + $(WINDOW_SYSTEM_OBJ) obj = $(base_obj) $(NS_OBJC_OBJ) ## Object files used on some machine or other. === modified file 'src/ccl.h' --- src/ccl.h 2012-07-03 18:24:42 +0000 +++ src/ccl.h 2012-09-01 06:38:52 +0000 @@ -26,6 +26,8 @@ #ifndef EMACS_CCL_H #define EMACS_CCL_H +#include "character.h" /* For MAX_MULTIBYTE_LENGTH */ + /* Macros for exit status of CCL program. */ #define CCL_STAT_SUCCESS 0 /* Terminated successfully. */ #define CCL_STAT_SUSPEND_BY_SRC 1 /* Terminated by empty input. */ === modified file 'src/dispnew.c' --- src/dispnew.c 2012-08-30 15:07:00 +0000 +++ src/dispnew.c 2012-09-01 06:38:52 +0000 @@ -47,17 +47,9 @@ #include "syssignal.h" -#ifdef HAVE_X_WINDOWS -#include "xterm.h" -#endif /* HAVE_X_WINDOWS */ - -#ifdef HAVE_NTGUI -#include "w32term.h" -#endif /* HAVE_NTGUI */ - -#ifdef HAVE_NS -#include "nsterm.h" -#endif +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#endif /* HAVE_WINDOW_SYSTEM */ /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ === modified file 'src/emacs.c' --- src/emacs.c 2012-09-01 01:04:26 +0000 +++ src/emacs.c 2012-09-01 08:01:36 +0000 @@ -31,6 +31,10 @@ #include "lisp.h" +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#endif /* HAVE_WINDOW_SYSTEM */ + #ifdef WINDOWSNT #include #include /* just for w32.h */ @@ -62,20 +66,12 @@ #include "gnutls.h" #endif -#ifdef HAVE_NS -#include "nsterm.h" -#endif - #if (defined PROFILING \ && (defined __FreeBSD__ || defined GNU_LINUX || defined __MINGW32__)) # include extern void moncontrol (int mode); #endif -#ifdef HAVE_X_WINDOWS -#include "xterm.h" -#endif - #ifdef HAVE_SETLOCALE #include #endif === modified file 'src/font.c' --- src/font.c 2012-08-16 21:58:44 +0000 +++ src/font.c 2012-09-01 06:38:52 +0000 @@ -38,17 +38,9 @@ #include "fontset.h" #include "font.h" -#ifdef HAVE_X_WINDOWS -#include "xterm.h" -#endif /* HAVE_X_WINDOWS */ - -#ifdef HAVE_NTGUI -#include "w32term.h" -#endif /* HAVE_NTGUI */ - -#ifdef HAVE_NS -#include "nsterm.h" -#endif /* HAVE_NS */ +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#endif /* HAVE_WINDOW_SYSTEM */ Lisp_Object Qopentype; === modified file 'src/frame.c' --- src/frame.c 2012-08-22 16:05:04 +0000 +++ src/frame.c 2012-09-01 06:38:52 +0000 @@ -30,15 +30,11 @@ #include "lisp.h" #include "character.h" -#ifdef HAVE_X_WINDOWS -#include "xterm.h" -#endif -#ifdef WINDOWSNT -#include "w32term.h" -#endif -#ifdef HAVE_NS -#include "nsterm.h" -#endif + +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#endif /* HAVE_WINDOW_SYSTEM */ + #include "buffer.h" /* These help us bind and responding to switch-frame events. */ #include "commands.h" @@ -58,11 +54,6 @@ #include "dosfns.h" #endif - -#ifdef HAVE_WINDOW_SYSTEM - -#endif - #ifdef HAVE_NS Lisp_Object Qns_parse_geometry; #endif === modified file 'src/frame.h' --- src/frame.h 2012-08-31 04:40:52 +0000 +++ src/frame.h 2012-09-01 06:38:52 +0000 @@ -1251,10 +1251,40 @@ Lisp_Object component, Lisp_Object subclass); +extern void set_frame_menubar (struct frame *f, int first_time, int deep_p); +extern void x_set_window_size (struct frame *f, int change_grav, + int cols, int rows); +extern void x_sync (struct frame *); +extern Lisp_Object x_get_focus_frame (struct frame *); +extern void x_set_mouse_position (struct frame *f, int h, int v); +extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y); +extern void x_make_frame_visible (struct frame *f); +extern void x_make_frame_invisible (struct frame *f); +extern void x_iconify_frame (struct frame *f); +extern int x_char_width (struct frame *f); +extern int x_char_height (struct frame *f); +extern int x_pixel_width (struct frame *f); +extern int x_pixel_height (struct frame *f); +extern void x_set_frame_alpha (struct frame *f); +extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_tool_bar_lines (struct frame *f, + Lisp_Object value, + Lisp_Object oldval); +extern void x_activate_menubar (struct frame *); +extern void x_real_positions (struct frame *, int *, int *); +extern int x_bitmap_icon (struct frame *, Lisp_Object); +extern void x_set_menu_bar_lines (struct frame *, + Lisp_Object, + Lisp_Object); +extern void free_frame_menubar (struct frame *); +extern void x_free_frame_resources (struct frame *); + #if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT extern char *x_get_resource_string (const char *, const char *); #endif +extern void x_query_colors (struct frame *f, XColor *, int); + /* In xmenu.c */ extern void set_frame_menubar (FRAME_PTR, int, int); === modified file 'src/gtkutil.h' --- src/gtkutil.h 2012-08-15 07:58:34 +0000 +++ src/gtkutil.h 2012-09-01 06:38:52 +0000 @@ -25,6 +25,7 @@ #include #include "frame.h" +#include "xterm.h" /* Minimum and maximum values used for GTK scroll bars */ === modified file 'src/image.c' --- src/image.c 2012-08-16 21:58:44 +0000 +++ src/image.c 2012-09-01 06:38:52 +0000 @@ -50,11 +50,19 @@ #include "termhooks.h" #include "font.h" +#ifdef HAVE_SYS_STAT_H +#include +#endif /* HAVE_SYS_STAT_H */ + +#ifdef HAVE_SYS_TYPES_H +#include +#endif /* HAVE_SYS_TYPES_H */ + +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#endif /* HAVE_WINDOW_SYSTEM */ + #ifdef HAVE_X_WINDOWS -#include "xterm.h" -#include -#include - #define COLOR_TABLE_SUPPORT 1 typedef struct x_bitmap_record Bitmap_Record; @@ -67,11 +75,7 @@ #define PIX_MASK_DRAW 1 #endif /* HAVE_X_WINDOWS */ - #ifdef HAVE_NTGUI -#include "w32.h" -#include "w32term.h" - /* W32_TODO : Color tables on W32. */ #undef COLOR_TABLE_SUPPORT @@ -84,15 +88,9 @@ #define PIX_MASK_RETAIN 0 #define PIX_MASK_DRAW 1 -#define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual #define x_defined_color w32_defined_color #define DefaultDepthOfScreen(screen) (one_w32_display_info.n_cbits) -/* Functions from w32term.c that depend on XColor (so can't go in w32term.h - without modifying lots of files). */ -extern void x_query_colors (struct frame *f, XColor *colors, int ncolors); -extern void x_query_color (struct frame *f, XColor *color); - /* Version of libpng that we were compiled with, or -1 if no PNG support was compiled in. This is tested by w32-win.el to correctly set up the alist used to search for PNG libraries. */ @@ -100,10 +98,6 @@ #endif /* HAVE_NTGUI */ #ifdef HAVE_NS -#include "nsterm.h" -#include -#include - #undef COLOR_TABLE_SUPPORT typedef struct ns_bitmap_record Bitmap_Record; @@ -117,10 +111,8 @@ #define PIX_MASK_RETAIN 0 #define PIX_MASK_DRAW 1 -#define FRAME_X_VISUAL FRAME_NS_DISPLAY_INFO (f)->visual #define x_defined_color(f, name, color_def, alloc) \ ns_defined_color (f, name, color_def, alloc, 0) -#define FRAME_X_SCREEN(f) 0 #define DefaultDepthOfScreen(screen) x_display_list->n_planes #endif /* HAVE_NS */ @@ -577,6 +569,7 @@ static int x_build_heuristic_mask (struct frame *, struct image *, Lisp_Object); #ifdef HAVE_NTGUI +extern Lisp_Object Vlibrary_cache, QCloaded_from; #define CACHE_IMAGE_TYPE(type, status) \ do { Vlibrary_cache = Fcons (Fcons (type, status), Vlibrary_cache); } while (0) #else === modified file 'src/keyboard.c' --- src/keyboard.c 2012-08-28 06:20:08 +0000 +++ src/keyboard.c 2012-09-01 06:38:52 +0000 @@ -63,20 +63,11 @@ #include #include -/* This is to get the definitions of the XK_ symbols. */ -#ifdef HAVE_X_WINDOWS -#include "xterm.h" -#endif - -#ifdef HAVE_NTGUI -#include "w32term.h" -#endif /* HAVE_NTGUI */ - -#ifdef HAVE_NS -#include "nsterm.h" -#endif - -/* Variables for blockinput.h: */ +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#endif /* HAVE_WINDOW_SYSTEM */ + +/* Variables for blockinput.h: */ /* Non-zero if interrupt input is blocked right now. */ volatile int interrupt_input_blocked; @@ -1324,7 +1315,7 @@ If ignore_mouse_drag_p is non-zero, ignore (implicit) mouse movement after resizing the tool-bar window. */ -#if !defined HAVE_WINDOW_SYSTEM || defined USE_GTK || defined HAVE_NS +#if !defined HAVE_WINDOW_SYSTEM static #endif int ignore_mouse_drag_p; === modified file 'src/keyboard.h' --- src/keyboard.h 2012-08-17 23:38:43 +0000 +++ src/keyboard.h 2012-09-01 06:38:52 +0000 @@ -469,7 +469,7 @@ happens. */ extern EMACS_TIME *input_available_clear_time; -#if defined HAVE_WINDOW_SYSTEM && !defined USE_GTK && !defined HAVE_NS +#if defined HAVE_WINDOW_SYSTEM extern int ignore_mouse_drag_p; #endif === modified file 'src/menu.c' --- src/menu.c 2012-08-05 15:47:28 +0000 +++ src/menu.c 2012-09-01 06:38:52 +0000 @@ -36,24 +36,13 @@ #include "../lwlib/lwlib.h" #endif -#ifdef HAVE_X_WINDOWS -#include "xterm.h" -#endif - -#ifdef HAVE_NS -#include "nsterm.h" -#endif - -#ifdef USE_GTK -#include "gtkutil.h" -#endif +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#endif /* HAVE_WINDOW_SYSTEM */ #ifdef HAVE_NTGUI -#include "w32term.h" - extern AppendMenuW_Proc unicode_append_menu; extern HMENU current_popup_menu; - #endif /* HAVE_NTGUI */ #include "menu.h" === modified file 'src/nsterm.h' --- src/nsterm.h 2012-08-28 16:05:17 +0000 +++ src/nsterm.h 2012-09-01 06:38:52 +0000 @@ -631,6 +631,8 @@ /* This is the `Display *' which frame F is on. */ #define FRAME_NS_DISPLAY(f) (0) #define FRAME_X_DISPLAY(f) (0) +#define FRAME_X_SCREEN(f) (0) +#define FRAME_X_VISUAL(f) FRAME_NS_DISPLAY_INFO(f)->visual #define FRAME_FOREGROUND_COLOR(f) ((f)->output_data.ns->foreground_color) #define FRAME_BACKGROUND_COLOR(f) ((f)->output_data.ns->background_color) @@ -780,31 +782,6 @@ extern Lisp_Object ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header); -/* More prototypes that should be moved to a more general include file */ -extern void set_frame_menubar (struct frame *f, int first_time, int deep_p); -extern void x_set_window_size (struct frame *f, int change_grav, - int cols, int rows); -extern void x_sync (struct frame *); -extern Lisp_Object x_get_focus_frame (struct frame *); -extern void x_set_mouse_position (struct frame *f, int h, int v); -extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y); -extern void x_make_frame_visible (struct frame *f); -extern void x_make_frame_invisible (struct frame *f); -extern void x_iconify_frame (struct frame *f); -extern int x_char_width (struct frame *f); -extern int x_char_height (struct frame *f); -extern int x_pixel_width (struct frame *f); -extern int x_pixel_height (struct frame *f); -extern void x_set_frame_alpha (struct frame *f); -extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); -extern void x_set_tool_bar_lines (struct frame *f, - Lisp_Object value, - Lisp_Object oldval); -extern void x_activate_menubar (struct frame *); -extern void free_frame_menubar (struct frame *); -extern void x_free_frame_resources (struct frame *); -extern void x_destroy_window (struct frame *); - #define NSAPP_DATA2_RUNASSCRIPT 10 extern void ns_run_ascript (void); === modified file 'src/process.c' --- src/process.c 2012-08-28 06:20:08 +0000 +++ src/process.c 2012-09-01 06:38:52 +0000 @@ -116,12 +116,13 @@ #include "gnutls.h" #endif +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#endif /* HAVE_WINDOW_SYSTEM */ + #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) #include "xgselect.h" #endif -#ifdef HAVE_NS -#include "nsterm.h" -#endif /* Work around GCC 4.7.0 bug with strict overflow checking; see . === modified file 'src/w32font.h' --- src/w32font.h 2012-07-29 08:18:29 +0000 +++ src/w32font.h 2012-09-01 06:38:52 +0000 @@ -19,6 +19,7 @@ #ifndef EMACS_W32FONT_H #define EMACS_W32FONT_H +#include "font.h" /* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for PostScript OpenType fonts, bit 18 for TrueType OpenType fonts, bit 20 for Type1 fonts. */ @@ -83,4 +84,7 @@ Lisp_Object intern_font_name (char *); +extern void syms_of_w32font (void); +extern void globals_of_w32font (void); + #endif === modified file 'src/w32term.h' --- src/w32term.h 2012-08-31 04:14:59 +0000 +++ src/w32term.h 2012-09-01 06:38:52 +0000 @@ -342,7 +342,7 @@ /* Return the window associated with the frame F. */ #define FRAME_W32_WINDOW(f) ((f)->output_data.w32->window_desc) -#define FRAME_X_WINDOW(f) ((f)->output_data.w32->window_desc) +#define FRAME_X_WINDOW(f) FRAME_W32_WINDOW (f) #define FRAME_FONT(f) ((f)->output_data.w32->font) #define FRAME_FONTSET(f) ((f)->output_data.w32->fontset) === modified file 'src/w32xfns.c' --- src/w32xfns.c 2012-07-29 08:18:29 +0000 +++ src/w32xfns.c 2012-09-01 06:38:52 +0000 @@ -438,6 +438,6 @@ /* x_sync is a no-op on W32. */ void -x_sync (void *f) +x_sync (struct frame *f) { } === modified file 'src/xfaces.c' --- src/xfaces.c 2012-08-21 10:21:04 +0000 +++ src/xfaces.c 2012-09-01 06:38:52 +0000 @@ -225,11 +225,10 @@ #include "dosfns.h" #endif +#ifdef HAVE_WINDOW_SYSTEM +#include TERM_HEADER +#include "fontset.h" #ifdef WINDOWSNT -#include "w32term.h" -#include "fontset.h" -/* Redefine X specifics to W32 equivalents to avoid cluttering the - code with #ifdef blocks. */ #undef FRAME_X_DISPLAY_INFO #define FRAME_X_DISPLAY_INFO FRAME_W32_DISPLAY_INFO #define x_display_info w32_display_info @@ -238,13 +237,13 @@ #endif /* WINDOWSNT */ #ifdef HAVE_NS -#include "nsterm.h" #undef FRAME_X_DISPLAY_INFO #define FRAME_X_DISPLAY_INFO FRAME_NS_DISPLAY_INFO #define x_display_info ns_display_info #define check_x check_ns #define GCGraphicsExposures 0 #endif /* HAVE_NS */ +#endif /* HAVE_WINDOW_SYSTEM */ #include "buffer.h" #include "dispextern.h" @@ -254,9 +253,6 @@ #include "termchar.h" #include "font.h" -#ifdef HAVE_WINDOW_SYSTEM -#include "fontset.h" -#endif /* HAVE_WINDOW_SYSTEM */ #ifdef HAVE_X_WINDOWS @@ -2565,13 +2561,13 @@ } else if (EQ (keyword, QCstipple)) { -#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) +#if defined (HAVE_WINDOW_SYSTEM) Lisp_Object pixmap_p = Fbitmap_spec_p (value); if (!NILP (pixmap_p)) to[LFACE_STIPPLE_INDEX] = value; else err = 1; -#endif +#endif /* HAVE_WINDOW_SYSTEM */ } else if (EQ (keyword, QCwidth)) { @@ -3125,14 +3121,14 @@ } else if (EQ (attr, QCstipple)) { -#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) +#if defined (HAVE_WINDOW_SYSTEM) if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value) && !NILP (value) && NILP (Fbitmap_spec_p (value))) signal_error ("Invalid stipple attribute", value); old_value = LFACE_STIPPLE (lface); ASET (lface, LFACE_STIPPLE_INDEX, value); -#endif /* HAVE_X_WINDOWS || HAVE_NS */ +#endif /* HAVE_WINDOW_SYSTEM */ } else if (EQ (attr, QCwidth)) { === modified file 'src/xterm.h' --- src/xterm.h 2012-08-31 04:14:59 +0000 +++ src/xterm.h 2012-09-01 06:38:52 +0000 @@ -16,6 +16,9 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ +#ifndef XTERM_H +#define XTERM_H + #include #include @@ -367,13 +370,14 @@ extern void check_x (void); extern struct frame *x_window_to_frame (struct x_display_info *, int); - extern struct frame *x_any_window_to_frame (struct x_display_info *, int); extern struct frame *x_menubar_window_to_frame (struct x_display_info *, XEvent *); - extern struct frame *x_top_window_to_frame (struct x_display_info *, int); +extern struct frame *x_menubar_window_to_frame (struct x_display_info *, + XEvent *); + #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) #define x_any_window_to_frame x_window_to_frame #define x_top_window_to_frame x_window_to_frame @@ -389,7 +393,6 @@ extern Lisp_Object x_display_name_list; extern struct x_display_info *x_display_info_for_display (Display *); -extern void x_set_frame_alpha (struct frame *); extern struct x_display_info *x_term_init (Lisp_Object, char *, char *); extern int x_display_ok (const char *); @@ -941,7 +944,6 @@ /* Defined in xterm.c */ extern int x_text_icon (struct frame *, const char *); -extern int x_bitmap_icon (struct frame *, Lisp_Object); extern void x_catch_errors (Display *); extern void x_check_errors (Display *, const char *) ATTRIBUTE_FORMAT_PRINTF (2, 0); @@ -953,11 +955,6 @@ extern void x_set_mouse_pixel_position (struct frame *, int, int); extern void xembed_request_focus (struct frame *); extern void x_ewmh_activate_frame (struct frame *); -extern void x_make_frame_visible (struct frame *); -extern void x_make_frame_invisible (struct frame *); -extern void x_iconify_frame (struct frame *); -extern void x_free_frame_resources (struct frame *); -extern void x_wm_set_size_hint (struct frame *, long, int); extern void x_delete_terminal (struct terminal *terminal); extern unsigned long x_copy_color (struct frame *, unsigned long); #ifdef USE_X_TOOLKIT @@ -970,7 +967,6 @@ double, int); #endif extern int x_alloc_nearest_color (struct frame *, Colormap, XColor *); -extern void x_query_colors (struct frame *f, XColor *, int); extern void x_query_color (struct frame *f, XColor *); extern void x_clear_area (Display *, Window, int, int, int, int, int); #if defined HAVE_MENUS && !defined USE_X_TOOLKIT && !defined USE_GTK @@ -1029,8 +1025,6 @@ extern int xg_set_icon_from_xpm_data (struct frame *, const char**); #endif /* USE_GTK */ -extern void x_real_positions (struct frame *, int *, int *); -extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); extern void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); extern void xic_free_xfontset (struct frame *); extern void create_frame_xic (struct frame *); @@ -1040,9 +1034,6 @@ extern void xic_set_xfontset (struct frame *, const char *); extern int x_pixel_width (struct frame *); extern int x_pixel_height (struct frame *); -extern int x_char_width (struct frame *); -extern int x_char_height (struct frame *); -extern void x_sync (struct frame *); extern int x_defined_color (struct frame *, const char *, XColor *, int); #ifdef HAVE_X_I18N extern void free_frame_xic (struct frame *); @@ -1050,7 +1041,6 @@ extern char * xic_create_fontsetname (const char *base_fontname, int motif); # endif #endif -extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); /* Defined in xfaces.c */ @@ -1067,10 +1057,8 @@ #ifdef USE_MOTIF extern void x_menu_wait_for_event (void *data); #endif -extern void x_activate_menubar (struct frame *); extern int popup_activated (void); extern void initialize_frame_menubar (struct frame *); -extern void free_frame_menubar (struct frame *); /* Defined in widget.c */ @@ -1112,3 +1100,5 @@ (nr).y = (ry), \ (nr).width = (rwidth), \ (nr).height = (rheight)) + +#endif /* XTERM_H */ ------------------------------------------------------------ revno: 109835 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12254 committer: Stefan Monnier branch nick: trunk timestamp: Sat 2012-09-01 00:28:24 -0400 message: * lisp/minibuffer.el (completion-at-point-functions): Complete docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-01 01:04:26 +0000 +++ lisp/ChangeLog 2012-09-01 04:28:24 +0000 @@ -1,3 +1,8 @@ +2012-09-01 Stefan Monnier + + * minibuffer.el (completion-at-point-functions): Complete docstring + (bug#12254). + 2012-09-01 Paul Eggert Better seed support for (random). === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2012-08-14 17:10:38 +0000 +++ lisp/minibuffer.el 2012-09-01 04:28:24 +0000 @@ -1821,7 +1821,9 @@ `:predicate' a predicate that completion candidates need to satisfy. `:exclusive' If `no', means that if the completion table fails to match the text at point, then instead of reporting a completion - failure, the completion should try the next completion function.") + failure, the completion should try the next completion function. +As is the case with most hooks, the functions are responsible to preserve +things like point and current buffer.") (defvar completion--capf-misbehave-funs nil "List of functions found on `completion-at-point-functions' that misbehave. ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.