Now on revision 106187. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106187 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9751 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-10-25 08:54:04 -0400 message: Make function-key-map apply when key is bound to `undefined'. * src/keyboard.c (test_undefined): New function. (read_key_sequence): Use it to detect when a key is bound to `undefined'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-25 04:27:47 +0000 +++ src/ChangeLog 2011-10-25 12:54:04 +0000 @@ -1,3 +1,8 @@ +2011-10-25 Stefan Monnier + + * keyboard.c (test_undefined): New function (bug#9751). + (read_key_sequence): Use it to detect when a key is bound to `undefined'. + 2011-10-25 Enami Tsugutomo * sysdep.c (init_sys_modes): Fix the check for the controlling === modified file 'src/keyboard.c' --- src/keyboard.c 2011-10-03 20:50:54 +0000 +++ src/keyboard.c 2011-10-25 12:54:04 +0000 @@ -8902,6 +8902,14 @@ return 0; } +static int +test_undefined (Lisp_Object binding) +{ + return (EQ (binding, Qundefined) + || (!NILP (binding) && SYMBOLP (binding) + && EQ (Fcommand_remapping (binding, Qnil, Qnil), Qundefined))); +} + /* Read a sequence of keys that ends with a non prefix character, storing it in KEYBUF, a buffer of size BUFSIZE. Prompt with PROMPT. @@ -9852,7 +9860,9 @@ } } - if (first_binding < nmaps && NILP (submaps[first_binding]) + if (first_binding < nmaps + && NILP (submaps[first_binding]) + && !test_undefined (defs[first_binding]) && indec.start >= t) /* There is a binding and it's not a prefix. (and it doesn't have any input-decode-map translation pending). @@ -9879,7 +9889,9 @@ /* If there's a binding (i.e. first_binding >= nmaps) we don't want to apply this function-key-mapping. */ - fkey.end + 1 == t && first_binding >= nmaps, + fkey.end + 1 == t + && (first_binding >= nmaps + || test_undefined (defs[first_binding])), &diff, prompt); UNGCPRO; if (done) ------------------------------------------------------------ revno: 106186 committer: Michael Albinus branch nick: trunk timestamp: Tue 2011-10-25 14:50:03 +0200 message: * net/tramp-sh.el (tramp-sh-handle-file-directory-p): Return t for filenames "/method:foo:". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-25 02:19:17 +0000 +++ lisp/ChangeLog 2011-10-25 12:50:03 +0000 @@ -1,3 +1,8 @@ +2011-10-25 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-file-directory-p): Return t for + filenames "/method:foo:". + 2011-10-25 Stefan Monnier * comint.el (comint-get-old-input-default): Fix use-prompt-regexp case === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2011-09-23 09:38:41 +0000 +++ lisp/net/tramp-sh.el 2011-10-25 12:50:03 +0000 @@ -1594,17 +1594,14 @@ (defun tramp-sh-handle-file-directory-p (filename) "Like `file-directory-p' for Tramp files." - ;; Care must be taken that this function returns `t' for symlinks - ;; pointing to directories. Surely the most obvious implementation - ;; would be `test -d', but that returns false for such symlinks. - ;; CCC: Stefan Monnier says that `test -d' follows symlinks. And - ;; I now think he's right. So we could be using `test -d', couldn't - ;; we? - ;; - ;; Alternatives: `cd %s', `test -d %s' (with-parsed-tramp-file-name filename nil - (with-file-property v localname "file-directory-p" - (tramp-run-test "-d" filename)))) + ;; `file-directory-p' is used as predicate for filename completion. + ;; Sometimes, when a connection is not established yet, it is + ;; desirable to return t immediately for "/method:foo:". It can + ;; be expected that this is always a directory. + (or (zerop (length localname)) + (with-file-property v localname "file-directory-p" + (tramp-run-test "-d" filename))))) (defun tramp-sh-handle-file-writable-p (filename) "Like `file-writable-p' for Tramp files." ------------------------------------------------------------ revno: 106185 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9865 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-10-25 08:33:31 -0400 message: * comint.el (comint-get-old-input-default): Fix thinko in last change. diff: === modified file 'lisp/comint.el' --- lisp/comint.el 2011-10-25 02:19:17 +0000 +++ lisp/comint.el 2011-10-25 12:33:31 +0000 @@ -2152,7 +2152,7 @@ the current line with any initial string matching the regexp `comint-prompt-regexp' removed." (let (bof) - (if (and comint-use-prompt-regexp + (if (and (not comint-use-prompt-regexp) ;; Make sure we're in an input rather than output field. (null (get-char-property (setq bof (field-beginning)) 'field))) (field-string-no-properties bof) ------------------------------------------------------------ revno: 106184 fixes bug(s): http://debbugs.gnu.org/9866 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-10-25 00:25:45 -0700 message: * abbrevs.texi (Saving Abbrevs): quietly-read-abbrev-file is not a command. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-24 02:01:54 +0000 +++ doc/emacs/ChangeLog 2011-10-25 07:25:45 +0000 @@ -1,3 +1,8 @@ +2011-10-25 Glenn Morris + + * abbrevs.texi (Saving Abbrevs): + quietly-read-abbrev-file is not a command. (Bug#9866) + 2011-10-24 Chong Yidong * display.texi (Scrolling): Document scroll-up-line and === modified file 'doc/emacs/abbrevs.texi' --- doc/emacs/abbrevs.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/abbrevs.texi 2011-10-25 07:25:45 +0000 @@ -286,8 +286,6 @@ Write a file @var{file} describing all defined abbrevs. @item M-x read-abbrev-file @key{RET} @var{file} @key{RET} Read the file @var{file} and define abbrevs as specified therein. -@item M-x quietly-read-abbrev-file @key{RET} @var{file} @key{RET} -Similar but do not display a message about what is going on. @item M-x define-abbrevs Define abbrevs from definitions in current buffer. @item M-x insert-abbrevs ------------------------------------------------------------ revno: 106183 fixes bug(s): http://debbugs.gnu.org/6649 author: Enami Tsugutomo committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-10-25 12:27:47 +0800 message: * sysdep.c (init_sys_modes): Fix the check for the controlling terminal. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-20 12:39:52 +0000 +++ src/ChangeLog 2011-10-25 04:27:47 +0000 @@ -1,3 +1,8 @@ +2011-10-25 Enami Tsugutomo + + * sysdep.c (init_sys_modes): Fix the check for the controlling + terminal (Bug#6649). + 2011-10-20 Eli Zaretskii * dispextern.h (struct bidi_it): New member next_en_type. === modified file 'src/sysdep.c' --- src/sysdep.c 2011-09-29 12:00:18 +0000 +++ src/sysdep.c 2011-10-25 04:27:47 +0000 @@ -854,6 +854,7 @@ init_sys_modes (struct tty_display_info *tty_out) { struct emacs_tty tty; + Lisp_Object terminal; Vtty_erase_char = Qnil; @@ -907,7 +908,9 @@ tty.main.c_cflag &= ~PARENB;/* Don't check parity */ } #endif - if (tty_out->input == stdin) + + XSETTERMINAL(terminal, tty_out->terminal); + if (!NILP (Fcontrolling_tty_p (terminal))) { tty.main.c_cc[VINTR] = quit_char; /* C-g (usually) gives SIGINT */ /* Set up C-g for both SIGQUIT and SIGINT. ------------------------------------------------------------ revno: 106182 committer: Christoph Scholtes branch nick: trunk timestamp: Mon 2011-10-24 20:33:24 -0600 message: * INSTALL: Update URL for GTK download page. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2011-10-22 09:17:01 +0000 +++ nt/ChangeLog 2011-10-25 02:33:24 +0000 @@ -1,3 +1,7 @@ +2011-10-25 Christoph Scholtes + + * INSTALL: Update URL for GTK download page. + 2011-10-19 Eli Zaretskii * config.nt (HAVE_TZNAME, HAVE_DECL_TZNAME): Define. === modified file 'nt/INSTALL' --- nt/INSTALL 2011-05-05 02:56:16 +0000 +++ nt/INSTALL 2011-10-25 02:33:24 +0000 @@ -323,7 +323,7 @@ For PNG images, we recommend to use versions 1.4.x and later of libpng, because previous versions had security issues. You can find precompiled libraries and headers on the GTK download page for - Windows (http://www.gtk.org/download-windows.html). + Windows (http://www.gtk.org/download/win32.php). Versions 1.4.0 and later of libpng are binary incompatible with earlier versions, so Emacs will only look for libpng libraries which ------------------------------------------------------------ revno: 106181 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9865 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-24 22:19:17 -0400 message: * lisp/comint.el (comint-get-old-input-default): Fix use-prompt-regexp case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-24 17:37:03 +0000 +++ lisp/ChangeLog 2011-10-25 02:19:17 +0000 @@ -1,3 +1,8 @@ +2011-10-25 Stefan Monnier + + * comint.el (comint-get-old-input-default): Fix use-prompt-regexp case + (bug#9865). + 2011-10-24 Glenn Morris * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819) === modified file 'lisp/comint.el' --- lisp/comint.el 2011-10-17 17:14:04 +0000 +++ lisp/comint.el 2011-10-25 02:19:17 +0000 @@ -2151,8 +2151,10 @@ If `comint-use-prompt-regexp' is non-nil, then return the current line with any initial string matching the regexp `comint-prompt-regexp' removed." - (let ((bof (field-beginning))) - (if (null (get-char-property bof 'field)) ;Not `output'. + (let (bof) + (if (and comint-use-prompt-regexp + ;; Make sure we're in an input rather than output field. + (null (get-char-property (setq bof (field-beginning)) 'field))) (field-string-no-properties bof) (comint-bol) (buffer-substring-no-properties (point) (line-end-position))))) ------------------------------------------------------------ revno: 106180 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-10-24 21:29:19 +0200 message: lisp/facemenu.el: Slightly expand a comment in `list-colors-duplicates'. diff: === modified file 'lisp/facemenu.el' --- lisp/facemenu.el 2011-10-18 14:31:27 +0000 +++ lisp/facemenu.el 2011-10-24 19:29:19 +0000 @@ -645,6 +645,8 @@ ;; text in menu entries) and `SystemWindowText' (the default ;; color w32 uses for the text in windows and dialogs) may ;; be the same display color and be adjacent in the list. + ;; These system colors all have names prefixed with "System", + ;; which is hardcoded in w32fns.c (SYSTEM_COLOR_PREFIX). ;; This makes them different to any other color. Bug#9722 (not (and (eq system-type 'windows-nt) (string-match-p "^System" (car (car l)))))) ------------------------------------------------------------ revno: 106179 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-24 13:37:03 -0400 message: * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-24 08:02:02 +0000 +++ lisp/ChangeLog 2011-10-24 17:37:03 +0000 @@ -1,3 +1,7 @@ +2011-10-24 Glenn Morris + + * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819) + 2011-10-24 Michael Albinus * notifications.el: Add the requirement of a running D-Bus session === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2011-10-19 12:54:24 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2011-10-24 17:37:03 +0000 @@ -94,8 +94,9 @@ Optional KEYMAP is the default keymap bound to the mode keymap. If non-nil, it should be a variable name (whose value is a keymap), or an expression that returns either a keymap or a list of - arguments for `easy-mmode-define-keymap'. If KEYMAP is not a symbol, - this also defines the variable MODE-map. + arguments for `easy-mmode-define-keymap'. If you supply a KEYMAP + argument that is not a symbol, this macro defines the variable + MODE-map and gives it the value that KEYMAP specifies. BODY contains code to execute each time the mode is enabled or disabled. It is executed after toggling the mode, and before running MODE-hook. ------------------------------------------------------------ revno: 106178 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-24 06:18:38 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-10-20 10:20:23 +0000 +++ autogen/configure 2011-10-24 10:18:38 +0000 @@ -10380,7 +10380,8 @@ if test "$HAVE_PTHREAD" = yes; then case "${canonical}" in *-hpux*) ;; - *) LIB_PTHREAD="-lpthread" ;; + *) LIB_PTHREAD="-lpthread" + LIBS="$LIB_PTHREAD $LIBS" ;; esac $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h