------------------------------------------------------------ revno: 116551 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-02-25 00:41:47 -0800 message: Doc updates related to tty-setup-hook * doc/emacs/custom.texi (Terminal Init): Replace term-setup-hook with tty-setup-hook. * doc/lispref/display.texi (Window Systems): * doc/lispref/hooks.texi (Standard Hooks): Replace term-setup-hook with tty-setup-hook. * doc/lispref/os.texi (Startup Summary, Init File, Terminal-Specific): Replace term-setup-hook with tty-setup-hook, and update. * doc/misc/edt.texi (Quick start, Starting emulation): * doc/misc/efaq.texi (Fullscreen mode on MS-Windows) (Terminal setup code works after Emacs has begun): Update hook details. * doc/misc/vip.texi (Loading VIP): Fix hook example. * lisp/faces.el (tty-setup-hook, tty-run-terminal-initialization): Doc fixes. * lisp/startup.el (term-setup-hook): Doc fix. Make obsolete. * lisp/emulation/edt.el: Comment update. * lisp/term/sun.el (sun-raw-prefix-hooks): Use tty-setup-hook instead of term-setup-hook. (terminal-init-sun): Construct message from bytecomp plist. * lisp/term/wyse50.el (enable-arrow-keys): Doc fix. * etc/refcards/vipcard.tex: Hook fix. * etc/NEWS: Related edit. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-02-23 19:23:12 +0000 +++ doc/emacs/ChangeLog 2014-02-25 08:41:47 +0000 @@ -1,3 +1,8 @@ +2014-02-25 Glenn Morris + + * custom.texi (Terminal Init): + Replace term-setup-hook with tty-setup-hook. + 2014-02-23 Glenn Morris * rmail.texi (Rmail Inbox): Mention rmail-mbox-format. === modified file 'doc/emacs/custom.texi' --- doc/emacs/custom.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/custom.texi 2014-02-25 08:41:47 +0000 @@ -2474,8 +2474,8 @@ file can prevent the loading of the terminal-specific library by setting @code{term-file-prefix} to @code{nil}. -@vindex term-setup-hook - Emacs runs the hook @code{term-setup-hook} at the end of +@vindex tty-setup-hook + Emacs runs the hook @code{tty-setup-hook} at the end of initialization, after both your @file{.emacs} file and any terminal-specific library have been read in. Add hook functions to this hook if you wish to override part of any of the terminal-specific === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-02-22 03:39:10 +0000 +++ doc/lispref/ChangeLog 2014-02-25 08:41:47 +0000 @@ -1,3 +1,12 @@ +2014-02-25 Glenn Morris + + * display.texi (Window Systems): + Replace term-setup-hook with emacs-startup-hook. + * hooks.texi (Standard Hooks): + Replace term-setup-hook with tty-setup-hook. + * os.texi (Startup Summary, Init File, Terminal-Specific): + Replace term-setup-hook with tty-setup-hook, and update. + 2014-02-22 Stefan Monnier * functions.texi (Declare Form): Document gv-expander, gv-setter, and === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2014-02-09 05:20:54 +0000 +++ doc/lispref/display.texi 2014-02-25 08:41:47 +0000 @@ -6378,7 +6378,7 @@ initialization files. Emacs runs this hook after it has completed loading your init file, the default initialization file (if any), and the terminal-specific Lisp code, and running the hook -@code{term-setup-hook}. +@code{emacs-startup-hook}. This hook is used for internal purposes: setting up communication with the window system, and creating the initial window. Users should not === modified file 'doc/lispref/hooks.texi' --- doc/lispref/hooks.texi 2014-01-01 07:43:34 +0000 +++ doc/lispref/hooks.texi 2014-02-25 08:41:47 +0000 @@ -1,7 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1993, 1998, 2001-2014 Free Software Foundation, -@c Inc. +@c Copyright (C) 1990-1993, 1998, 2001-2014 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Standard Hooks @appendix Standard Hooks @@ -213,7 +212,7 @@ @itemx temp-buffer-show-hook @xref{Temporary Displays}. -@item term-setup-hook +@item tty-setup-hook @xref{Terminal-Specific}. @item window-configuration-change-hook === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2014-01-01 07:43:34 +0000 +++ doc/lispref/os.texi 2014-02-25 08:41:47 +0000 @@ -175,8 +175,8 @@ @item If started on a text terminal, it loads the terminal-specific -Lisp library, which is specified by the variable -@code{term-file-prefix} (@pxref{Terminal-Specific}). This is not done +Lisp library (@pxref{Terminal-Specific}), and runs the hook +@code{tty-setup-hook}. This is not done in @code{--batch} mode, nor if @code{term-file-prefix} is @code{nil}. @c Now command-line calls command-line-1. @@ -210,7 +210,7 @@ @c daemon/session restore step? @item -It runs @code{emacs-startup-hook} and then @code{term-setup-hook}. +It runs @code{emacs-startup-hook}. @item It calls @code{frame-notice-user-settings}, which modifies the @@ -408,8 +408,7 @@ @defvar emacs-startup-hook This normal hook is run, once, just after handling the command line -arguments, just before @code{term-setup-hook}. In batch mode, Emacs -does not run either of these hooks. +arguments. In batch mode, Emacs does not run this hook. @end defvar @defvar user-init-file @@ -440,12 +439,12 @@ The usual role of a terminal-specific library is to enable special keys to send sequences that Emacs can recognize. It may also need to set or add to @code{input-decode-map} if the Termcap or Terminfo entry -does not specify all the terminal's function keys. @xref{Terminal -Input}. +does not specify all the terminal's function keys. @xref{Terminal Input}. - When the name of the terminal type contains a hyphen or underscore, and no library -is found whose name is identical to the terminal's name, Emacs strips -from the terminal's name the last hyphen or underscore and everything that follows + When the name of the terminal type contains a hyphen or underscore, +and no library is found whose name is identical to the terminal's +name, Emacs strips from the terminal's name the last hyphen or +underscore and everything that follows it, and tries again. This process is repeated until Emacs finds a matching library, or until there are no more hyphens or underscores in the name (i.e., there is no terminal-specific library). For example, if the @@ -454,17 +453,13 @@ @file{term/xterm.el}. If necessary, the terminal library can evaluate @code{(getenv "TERM")} to find the full name of the terminal type. - Your init file can prevent the loading of the -terminal-specific library by setting the variable -@code{term-file-prefix} to @code{nil}. This feature is useful when -experimenting with your own peculiar customizations. + Your init file can prevent the loading of the terminal-specific +library by setting the variable @code{term-file-prefix} to @code{nil}. You can also arrange to override some of the actions of the -terminal-specific library by setting the variable -@code{term-setup-hook}. This is a normal hook that Emacs runs -at the end of its initialization, after loading both -your init file and any terminal-specific libraries. You could -use this hook to define initializations for terminals that do not +terminal-specific library by using @code{tty-setup-hook}. This is +a normal hook that Emacs runs after initializing a new text terminal. +You could use this hook to define initializations for terminals that do not have their own libraries. @xref{Hooks}. @defvar term-file-prefix @@ -484,13 +479,13 @@ On MS-DOS, Emacs sets the @env{TERM} environment variable to @samp{internal}. @end defvar -@defvar term-setup-hook -This variable is a normal hook that Emacs runs after loading your -init file, the default initialization file (if any) and the -terminal-specific Lisp file. - -You can use @code{term-setup-hook} to override the definitions made by a -terminal-specific file. +@defvar tty-setup-hook +This variable is a normal hook that Emacs runs after initializing a +new text terminal. (This applies when Emacs starts up in non-windowed +mode, and when making a tty @command{emacsclient} connection.) The +hook runs after loading your init file (if applicable) and the +terminal-specific Lisp file, so you can use it to adjust the +definitions made by that file. For a related feature, @pxref{Window Systems, window-setup-hook}. @end defvar === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-25 03:11:11 +0000 +++ doc/misc/ChangeLog 2014-02-25 08:41:47 +0000 @@ -1,5 +1,10 @@ 2014-02-25 Glenn Morris + * edt.texi (Quick start, Starting emulation): Update hook details. + * efaq.texi (Fullscreen mode on MS-Windows) + (Terminal setup code works after Emacs has begun): Update hook details. + * vip.texi (Loading VIP): Fix hook example. + * efaq-w32.texi (Bash): Don't use setq with hooks. 2014-02-24 Paul Eggert === modified file 'doc/misc/edt.texi' --- doc/misc/edt.texi 2014-01-06 05:25:46 +0000 +++ doc/misc/edt.texi 2014-02-25 08:41:47 +0000 @@ -91,7 +91,7 @@ @file{.emacs} file: @example -(add-hook term-setup-hook 'edt-emulation-on) +(add-hook 'emacs-startup-hook 'edt-emulation-on) @end example @noindent @strong{Important:} Be sure to read the rest of this manual. @@ -295,7 +295,7 @@ @file{.emacs} file: @example -(add-hook term-setup-hook 'edt-emulation-on) +(add-hook 'emacs-startup-hook 'edt-emulation-on) @end example A reference sheet is included (later on) listing the default EDT === modified file 'doc/misc/efaq.texi' --- doc/misc/efaq.texi 2014-01-31 07:28:17 +0000 +++ doc/misc/efaq.texi 2014-02-25 08:41:47 +0000 @@ -2684,8 +2684,8 @@ put the following in your @file{.emacs} file: @lisp -(add-hook 'term-setup-hook - #'(lambda () (w32-send-sys-command ?\xF030))) +(add-hook 'emacs-startup-hook + (lambda () (w32-send-sys-command ?\xF030))) @end lisp To avoid the slightly distracting visual effect of Emacs starting with @@ -3594,12 +3594,12 @@ code/file execution order is not enforced after startup). To postpone the execution of Emacs Lisp code until after terminal or -window-system setup, treat the code as a @dfn{lambda list} and set the -value of either the @code{term-setup-hook} or @code{window-setup-hook} -variable to this lambda function. For example, +window-system setup, treat the code as a @dfn{lambda list} and add it to +@code{emacs-startup-hook} (or @code{tty-setup-hook} in Emacs 24.4 and +newer). For example, @lisp -(add-hook 'term-setup-hook +(add-hook 'emacs-startup-hook (lambda () (when (string-match "\\`vt220" (or (getenv "TERM") "")) ;; Make vt220's "Do" key behave like M-x: === modified file 'doc/misc/vip.texi' --- doc/misc/vip.texi 2014-01-27 02:02:28 +0000 +++ doc/misc/vip.texi 2014-02-25 08:41:47 +0000 @@ -165,7 +165,7 @@ to be in vi mode whenever Emacs starts up, you can include the following line in your @file{.emacs} file instead of the above line: @example -(setq term-setup-hook 'vip-mode) +(add-hook 'emacs-startup-hook 'vip-mode) @end example @noindent (@xref{Vi Mode}, for the explanation of vi mode.) === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-02-23 19:46:38 +0000 +++ etc/ChangeLog 2014-02-25 08:41:47 +0000 @@ -1,3 +1,7 @@ +2014-02-25 Glenn Morris + + * refcards/vipcard.tex: Hook fix. + 2014-02-23 Juanma Barranquero * NEWS: Fix references to ?« and ?» that got mangled somehow. === modified file 'etc/NEWS' --- etc/NEWS 2014-02-23 19:46:38 +0000 +++ etc/NEWS 2014-02-25 08:41:47 +0000 @@ -1202,7 +1202,12 @@ display or frame whenever a mouse is supported on that display or frame. -*** New hook `tty-setup-hook'. ++++ +*** New hook `tty-setup-hook', run at the end of initializing a text terminal. + ++++ +*** The hook `term-setup-hook' is obsolete. It is entirely equivalent +to `emacs-startup-hook'. See also the new `tty-setup-hook'. ** Window Handling === modified file 'etc/refcards/vipcard.tex' --- etc/refcards/vipcard.tex 2014-01-01 07:43:34 +0000 +++ etc/refcards/vipcard.tex 2014-02-25 08:41:47 +0000 @@ -279,7 +279,7 @@ include the line: \hskip 5ex -\kbd{(setq term-setup-hook 'vip-mode)} +\kbd{(add-hook 'emacs-startup-hook 'vip-mode)} in your \kbd{.emacs} file. Or, you can put the following alias in your \kbd{.cshrc} file. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-24 17:24:14 +0000 +++ lisp/ChangeLog 2014-02-25 08:41:47 +0000 @@ -1,3 +1,12 @@ +2014-02-25 Glenn Morris + + * faces.el (tty-setup-hook, tty-run-terminal-initialization): Doc fixes. + * startup.el (term-setup-hook): Doc fix. Make obsolete. + * term/sun.el (sun-raw-prefix-hooks): + Use tty-setup-hook instead of term-setup-hook. + (terminal-init-sun): Construct message from bytecomp plist. + * term/wyse50.el (enable-arrow-keys): Doc fix. + 2014-02-24 Juanma Barranquero * term/sun.el (kill-region-and-unmark, sun-raw-prefix-hooks): === modified file 'lisp/emulation/edt.el' --- lisp/emulation/edt.el 2014-01-01 07:43:34 +0000 +++ lisp/emulation/edt.el 2014-02-25 08:41:47 +0000 @@ -1,7 +1,6 @@ ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs -;; Copyright (C) 1986, 1992-1995, 2000-2014 Free Software Foundation, -;; Inc. +;; Copyright (C) 1986, 1992-1995, 2000-2014 Free Software Foundation, Inc. ;; Author: Kevin Gallagher ;; Maintainer: Kevin Gallagher @@ -51,7 +50,7 @@ ;; you initiate a GNU Emacs session, by adding the following line to ;; your init file: ;; -;; (add-hook term-setup-hook 'edt-emulation-on) +;; (add-hook 'emacs-startup-hook 'edt-emulation-on) ;; IMPORTANT: Be sure to read the Info node `edt' for more details. ;; It contains very helpful user information. === modified file 'lisp/faces.el' --- lisp/faces.el 2014-02-14 06:59:24 +0000 +++ lisp/faces.el 2014-02-25 08:41:47 +0000 @@ -2107,12 +2107,16 @@ (defvar tty-setup-hook nil "Hook run after running the initialization function of a new text terminal. +Specifically, `tty-run-terminal-initialization' runs this. This can be used to fine tune the `input-decode-map', for example.") (defun tty-run-terminal-initialization (frame &optional type) "Run the special initialization code for the terminal type of FRAME. The optional TYPE parameter may be used to override the autodetected -terminal type to a different value." +terminal type to a different value. As a final step, this runs the +hook `tty-setup-hook'. + +If you set `term-file-prefix' to nil, this function does nothing." (setq type (or type (tty-type frame))) ;; Load library for our terminal type. ;; User init file can set term-file-prefix to nil to prevent this. === modified file 'lisp/startup.el' --- lisp/startup.el 2014-02-10 01:34:22 +0000 +++ lisp/startup.el 2014-02-25 08:41:47 +0000 @@ -1,7 +1,6 @@ ;;; startup.el --- process Emacs shell arguments -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1992, 1994-2014 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985-1986, 1992, 1994-2014 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal @@ -282,10 +281,15 @@ "Normal hook run after loading init files and handling the command line.") (defvar term-setup-hook nil - "Normal hook run after loading terminal-specific Lisp code. -It also follows `emacs-startup-hook'. This hook exists for users to set, -so as to override the definitions made by the terminal-specific file. -Emacs never sets this variable itself.") + "Normal hook run immediately after `emacs-startup-hook'. +In new code, there is no reason to use this instead of `emacs-startup-hook'. +If you want to execute terminal-specific Lisp code, for example +to override the definitions made by the terminal-specific file, +see `tty-setup-hook'.") + +(make-obsolete-variable 'term-setup-hook + "use either `emacs-startup-hook' or \ +`tty-setup-hook' instead." "24.4") (defvar inhibit-startup-hooks nil "Non-nil means don't run `term-setup-hook' and `emacs-startup-hook'. === modified file 'lisp/term/sun.el' --- lisp/term/sun.el 2014-02-24 17:24:14 +0000 +++ lisp/term/sun.el 2014-02-25 08:41:47 +0000 @@ -123,7 +123,8 @@ (defvar sun-raw-prefix-hooks nil "List of forms to evaluate after setting `sun-raw-prefix'.") -(make-obsolete-variable 'sun-raw-prefix-hooks 'term-setup-hook "21.1") +;; Obsolete since 21.1, but tty-setup-hook only exists since 24.4. +(make-obsolete-variable 'sun-raw-prefix-hooks 'tty-setup-hook "21.1") @@ -149,7 +150,9 @@ (global-set-key [f7] 'enlarge-window) (when sun-raw-prefix-hooks - (message "sun-raw-prefix-hooks is obsolete! Use term-setup-hook instead!") + (message "sun-raw-prefix-hooks is obsolete! Use %s instead!" + (or (car-safe (get 'sun-raw-prefix-hooks 'byte-obsolete-variable)) + "emacs-startup-hook")) (let ((hooks sun-raw-prefix-hooks)) (while hooks (eval (car hooks)) === modified file 'lisp/term/wyse50.el' --- lisp/term/wyse50.el 2014-01-01 07:43:34 +0000 +++ lisp/term/wyse50.el 2014-02-25 08:41:47 +0000 @@ -1,7 +1,6 @@ ;;; wyse50.el --- terminal support code for Wyse 50 -;; Copyright (C) 1989, 1993-1994, 2001-2014 Free Software Foundation, -;; Inc. +;; Copyright (C) 1989, 1993-1994, 2001-2014 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer , ;; Jim Blandy @@ -132,7 +131,7 @@ (concat "\ea23R" (1+ (frame-width)) "C\eG0")))))) (defun enable-arrow-keys () - "To be called by `term-setup-hook'. Overrides 6 Emacs standard keys + "To be called by `tty-setup-hook'. Overrides 6 Emacs standard keys whose functions are then typed as follows: C-a Funct Left-arrow C-h M-? ------------------------------------------------------------ revno: 116550 committer: Glenn Morris branch nick: trunk timestamp: Mon 2014-02-24 22:11:11 -0500 message: In doc/, use add-hook rather than setq for hooks * doc/lispintro/emacs-lisp-intro.texi (X11 Colors): * doc/misc/efaq-w32.texi (Bash): Don't use setq with hooks. diff: === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2014-02-13 02:19:48 +0000 +++ doc/lispintro/ChangeLog 2014-02-25 03:11:11 +0000 @@ -1,3 +1,7 @@ +2014-02-25 Glenn Morris + + * emacs-lisp-intro.texi (X11 Colors): Don't use setq with hooks. + 2014-02-06 Glenn Morris * emacs-lisp-intro.texi (Recursive Patterns): === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2014-02-06 02:26:57 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2014-02-25 03:11:11 +0000 @@ -17755,7 +17755,7 @@ @group ;; Set calendar highlighting colors -(setq calendar-load-hook +(add-hook 'calendar-load-hook (lambda () (set-face-foreground 'diary-face "skyblue") (set-face-background 'holiday-face "slate blue") === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-24 07:12:42 +0000 +++ doc/misc/ChangeLog 2014-02-25 03:11:11 +0000 @@ -1,3 +1,7 @@ +2014-02-25 Glenn Morris + + * efaq-w32.texi (Bash): Don't use setq with hooks. + 2014-02-24 Paul Eggert * texinfo.tex: Update from gnulib. === modified file 'doc/misc/efaq-w32.texi' --- doc/misc/efaq-w32.texi 2014-02-16 14:52:43 +0000 +++ doc/misc/efaq-w32.texi 2014-02-25 03:11:11 +0000 @@ -1464,7 +1464,7 @@ (setq comint-eol-on-send t) (setq w32-quote-process-args ?\") -(setq shell-mode-hook 'my-shell-setup) +(add-hook 'shell-mode-hook 'my-shell-setup) @end example If you find that you are having trouble with Emacs tracking drive ------------------------------------------------------------ revno: 116549 committer: Glenn Morris branch nick: trunk timestamp: Mon 2014-02-24 21:46:59 -0500 message: * admin/notes/multi-tty: Remove some of the more obviously obsolete stuff. diff: === modified file 'admin/notes/multi-tty' --- admin/notes/multi-tty 2014-01-01 07:43:34 +0000 +++ admin/notes/multi-tty 2014-02-25 02:46:59 +0000 @@ -101,16 +101,6 @@ I plan to implement better user notification and support for breaking out of single-kboard mode from locked displays. - * Mac and DOS support is broken, doesn't even - compile. Multiple display support will probably not provide - new Emacs features on these systems, but the multi-tty - branch changed a few low-level interfaces, and the - system-dependent source files need to be adapted - accordingly. The changes are mostly trivial, so almost - anyone can help, if only by compiling the branch and - reporting the compiler errors. - - TESTING ------- @@ -504,17 +494,6 @@ (This is likely an error in the CVS trunk.) -** Dan Nicolaescu suggests that -nw should be added as an alias for -t - in emacsclient. Good idea. (Alas, implementing this is not - trivial, getopt_long does not seem to support two-letter ``short'' - options. Patches are welcome.) - -** Mark Plaksin suggests that emacsclient should accept the same - X-related command-line arguments as Emacs. Most of the X-related - argument-handling is done in Lisp, so this should be quite easy to - implement. (For example, Samium Gromoff wants emacsclient to - support --geometry; implementing this would add that support.) - ** Gergely Nagy suggests that C-x # should only kill the current frame, not any other emacsclient frame that may have the same file opened for editing. I think I agree with him. @@ -532,21 +511,9 @@ an initial frame. (The user would connect to it and open frames later, with emacsclient.) -** Fix Mac support (I can't do this entirely myself). Note that the - current state of Mac-specific source files in the multi-tty tree - are not useful; before starting work on Mac support, revert to - pristine, pre-multi-tty versions. - -** Fix DOS support (I can't do this entirely myself). Note that the - current state of DOS-specific source files in the multi-tty tree - are not useful; before starting work on DOS support, revert to - pristine, pre-multi-tty versions. - -** Fix Windows support. Currently bootstrapping works on w32, but Emacs - crashes on startup and none of the multi-tty features are - implemented. Many XXX comments mark things that probably need - updating, ChangeLogs will help in spotting changes to X specific - files that may need porting. +** Implement Mac/Windows/DOS support. Many XXX comments mark things + that probably need updating, ChangeLogs will help in spotting + changes to X specific files that may need porting. ** Do a grep on XXX and ?? for more issues. @@ -1085,18 +1052,6 @@ (Done.) --- Miles Bader suggests that C-x C-c on an emacsclient frame should - only close the frame, not exit the entire Emacs session. Update: - see above for a function that does this. Maybe this should be the - new default? - - (Done. This is the new default. No complaints so far.) - --- Clean up the frame-local variable system. I think it's ugly and - error-prone. But maybe I just haven't yet fully understood it. - - (Nothing to do. It doesn't seem ugly any more. It's rather clever.) - -- Support multiple character locales. A version of `set-locale-environment' needs to be written for setting up display-local settings on ttys. I think calling @@ -1114,18 +1069,6 @@ (Done, by making `function-key-map' terminal-local (i.e., part of struct kboard). This has probably covered all the remaining problems.) --- Make `function-key-map' and `key-translation-map' terminal-local. - - (Done.) - --- Implement `terminal-local-value' and `set-terminal-local-value' to - allow deterministic access to terminal local bindings. The - encode-kb package can not set up `key-translation-map' without - these. The terminal-local bindings seem to be independent of what - frame is selected. - - (Done.) - -- xt-mouse.el needs to be adapted for multi-tty. It currently signals an error on kill-emacs under X, which prevents the user from exiting Emacs. (Reported by Mnemonikk on freenode.) ------------------------------------------------------------ revno: 116548 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-02-24 18:24:14 +0100 message: lisp/term/sun.el: Fix docstring typos. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-24 15:48:32 +0000 +++ lisp/ChangeLog 2014-02-24 17:24:14 +0000 @@ -1,3 +1,8 @@ +2014-02-24 Juanma Barranquero + + * term/sun.el (kill-region-and-unmark, sun-raw-prefix-hooks): + Fix docstring typos. + 2014-02-24 Michael Albinus * net/tramp-sh.el (tramp-sh-handle-file-truename): Improve last fix. === modified file 'lisp/term/sun.el' --- lisp/term/sun.el 2014-01-01 07:43:34 +0000 +++ lisp/term/sun.el 2014-02-24 17:24:14 +0000 @@ -38,7 +38,7 @@ (scroll-up n)) (defun kill-region-and-unmark (beg end) - "Like kill-region, but pops the mark [which equals point, anyway.]" + "Like `kill-region', but pops the mark [which equals point, anyway.]" (interactive "r") (kill-region beg end) (setq this-command 'kill-region-and-unmark) @@ -122,7 +122,7 @@ ;; for you to put your own bindings in. (defvar sun-raw-prefix-hooks nil - "List of forms to evaluate after setting sun-raw-prefix.") + "List of forms to evaluate after setting `sun-raw-prefix'.") (make-obsolete-variable 'sun-raw-prefix-hooks 'term-setup-hook "21.1") ------------------------------------------------------------ revno: 116547 committer: Michael Albinus branch nick: trunk timestamp: Mon 2014-02-24 16:48:32 +0100 message: * net/tramp-sh.el (tramp-sh-handle-file-truename): Improve last fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-24 15:41:46 +0000 +++ lisp/ChangeLog 2014-02-24 15:48:32 +0000 @@ -1,3 +1,7 @@ +2014-02-24 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-file-truename): Improve last fix. + 2014-02-24 Nicolas Richard * minibuffer.el (completion--try-word-completion): === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-02-23 14:51:29 +0000 +++ lisp/net/tramp-sh.el 2014-02-24 15:48:32 +0000 @@ -938,8 +938,11 @@ (defun tramp-sh-handle-file-truename (filename) "Like `file-truename' for Tramp files." - (with-parsed-tramp-file-name (expand-file-name filename) nil - (tramp-make-tramp-file-name method user host + (format + "%s%s" + (with-parsed-tramp-file-name (expand-file-name filename) nil + (tramp-make-tramp-file-name + method user host (with-tramp-file-property v localname "file-truename" (let ((result nil)) ; result steps in reverse order (tramp-message v 4 "Finding true name for `%s'" filename) @@ -1042,8 +1045,10 @@ (setq result (concat result "/")))))) (tramp-message v 4 "True name of `%s' is `%s'" localname result) - (if (string-equal (file-name-nondirectory localname) "") - (file-name-as-directory result) result)))))) + result)))) + + ;; Preserve trailing "/". + (if (string-equal (file-name-nondirectory filename) "") "/" ""))) ;; Basic functions. ------------------------------------------------------------ revno: 116546 fixes bug: http://debbugs.gnu.org/16808 author: Nicolas Richard committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-02-24 16:41:46 +0100 message: lisp/minibuffer.el: Fix bug#16808. (completion--try-word-completion): Fix error when completing M-x commands. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-24 03:55:17 +0000 +++ lisp/ChangeLog 2014-02-24 15:41:46 +0000 @@ -1,3 +1,8 @@ +2014-02-24 Nicolas Richard + + * minibuffer.el (completion--try-word-completion): + Fix error when completing M-x commands (bug#16808). + 2014-02-24 Leo Liu * emacs-lisp/easy-mmode.el (define-minor-mode): Fix debug spec. === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2014-02-08 05:15:31 +0000 +++ lisp/minibuffer.el 2014-02-24 15:41:46 +0000 @@ -1371,7 +1371,7 @@ (concat before ext after) table predicate (1+ point) md)) exts)))) - (when (and (= 1 (length comps) (consp (car comps)))) + (when (and (null (cdr comps)) (consp (car comps))) (setq comp (car comps))))) ;; Completing a single word is actually more difficult than completing ------------------------------------------------------------ revno: 116545 [merge] committer: Daniel Colascione branch nick: trunk timestamp: Mon 2014-02-24 06:27:37 -0800 message: Fix event race diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-22 21:49:10 +0000 +++ src/ChangeLog 2014-02-24 14:27:37 +0000 @@ -1,3 +1,7 @@ +2014-02-24 Daniel Colascione + + * keyboard.c (read_char): Close race that resulted in lost events. + 2014-02-22 Glenn Morris * frame.c (frame-alpha-lower-limit, frame-resize-pixelwise): === modified file 'src/keyboard.c' --- src/keyboard.c 2014-02-08 04:02:16 +0000 +++ src/keyboard.c 2014-02-24 14:26:49 +0000 @@ -2891,8 +2891,12 @@ { c = read_decoded_event_from_main_queue (end_time, local_getcjmp, prev_event, used_mouse_menu); - if (end_time && timespec_cmp (*end_time, current_timespec ()) <= 0) - goto exit; + if (NILP(c) && end_time && + timespec_cmp (*end_time, current_timespec ()) <= 0) + { + goto exit; + } + if (EQ (c, make_number (-2))) { /* This is going to exit from read_char ------------------------------------------------------------ revno: 116544 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-02-23 23:12:42 -0800 message: Merge from gnulib. 2014-02-21 timer: fix uClibc detection of threading 2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf * texinfo.tex: Update from gnulib. diff: === modified file 'ChangeLog' --- ChangeLog 2014-02-18 01:47:35 +0000 +++ ChangeLog 2014-02-24 07:12:42 +0000 @@ -1,3 +1,9 @@ +2014-02-24 Paul Eggert + + Merge from gnulib, incorporating: + 2014-02-21 timer: fix uClibc detection of threading + 2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf + 2014-02-18 Mirek Kaim (tiny change) * configure.ac [HAVE_W32]: Test for ImageMagick. (Bug#16754) === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-22 23:14:49 +0000 +++ doc/misc/ChangeLog 2014-02-24 07:12:42 +0000 @@ -1,3 +1,7 @@ +2014-02-24 Paul Eggert + + * texinfo.tex: Update from gnulib. + 2014-02-22 Xue Fuqiao * remember.texi (Quick Start): Add an index. === modified file 'doc/misc/texinfo.tex' --- doc/misc/texinfo.tex 2014-02-12 22:09:31 +0000 +++ doc/misc/texinfo.tex 2014-02-24 07:12:42 +0000 @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2014-02-09.15} +\def\texinfoversion{2014-02-16.16} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -4428,7 +4428,7 @@ % complicated, when \tex is in effect and \{ is a \delimiter again. % We can't use \lbracecmd and \rbracecmd because texindex assumes % braces and backslashes are used only as delimiters. Perhaps we - % should define @lbrace and @rbrace commands a la @comma. + % should use @lbracechar and @rbracechar? \def\{{{\tt\char123}}% \def\}{{\tt\char125}}% % @@ -4449,8 +4449,7 @@ % @end macro % ... % @funindex commtest - % - % The above is not enough to reproduce the bug, but it gives the flavor. + % This is not enough to reproduce the bug, but it gives the flavor. % % Sample whatsit resulting: % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} @@ -4663,6 +4662,9 @@ \let\xeatspaces = \eatspaces } +% For testing: output @{ and @} in index sort strings as \{ and \}. +\newif\ifusebracesinindexes + % \indexnofonts is used when outputting the strings to sort the index % by, and when constructing control sequence names. It eliminates all % control sequences and just writes whatever the best ASCII sort string @@ -4691,11 +4693,16 @@ % Unfortunately, texindex is not prepared to handle braces in the % content at all. So for index sorting, we map @{ and @} to strings % starting with |, since that ASCII character is between ASCII { and }. - \def\{{|a}% - \def\lbracechar{|a}% + \ifusebracesinindexes + \def\lbracechar{\lbracecmd}% + \def\rbracechar{\rbracecmd}% + \else + \def\lbracechar{|a}% + \def\rbracechar{|b}% + \fi + \let\{=\lbracechar + \let\}=\rbracechar % - \def\}{|b}% - \def\rbracechar{|b}% % % Non-English letters. \def\AA{AA}% === modified file 'm4/gnulib-common.m4' --- m4/gnulib-common.m4 2014-01-11 07:01:30 +0000 +++ m4/gnulib-common.m4 2014-02-24 07:12:42 +0000 @@ -379,3 +379,59 @@ # AS_VAR_COPY was added in autoconf 2.63b m4_define_default([AS_VAR_COPY], [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) + +# AC_PROG_SED was added in autoconf 2.59b +m4_ifndef([AC_PROG_SED], +[AC_DEFUN([AC_PROG_SED], +[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, + [dnl ac_script should not contain more than 99 commands (for HP-UX sed), + dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + AS_UNSET([ac_script]) + if test -z "$SED"; then + ac_path_SED_found=false + _AS_PATH_WALK([], [ + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + AS_EXECUTABLE_P(["$ac_path_SED"]) || continue + case `"$ac_path_SED" --version 2>&1` in + *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;; + *) + ac_count=0 + _AS_ECHO_N([0123456789]) >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >> conftest.nl + "$ac_path_SED" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best so far, but keep looking for better + ac_cv_path_SED=$ac_path_SED + ac_path_SED_max=$ac_count + fi + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + $ac_path_SED_found && break 3 + done + done]) + if test -z "$ac_cv_path_SED"; then + AC_ERROR([no acceptable sed could be found in \$PATH]) + fi + else + ac_cv_path_SED=$SED + fi + SED="$ac_cv_path_SED" + AC_SUBST([SED])dnl + rm -f conftest.sed +])])]) === modified file 'm4/timer_time.m4' --- m4/timer_time.m4 2014-01-01 07:43:34 +0000 +++ m4/timer_time.m4 2014-02-24 07:12:42 +0000 @@ -28,7 +28,7 @@ #include #ifdef __GNU_LIBRARY__ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \ - && !defined __UCLIBC__ + && !(__UCLIBC__ && __HAS_NO_THREADS__) Thread emulation available #endif #endif ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.