Mercurial > emacs
changeset 107013:ef5fafbceb01
Merged from trunk
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Thu, 21 Jan 2010 23:43:05 +0800 |
| parents | 64f5a4a297e8 (current diff) 938f7da4579e (diff) |
| children | 3baccc6f1381 |
| files | |
| diffstat | 9 files changed, 34 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Thu Jan 21 07:04:21 2010 +0800 +++ b/doc/emacs/ChangeLog Thu Jan 21 23:43:05 2010 +0800 @@ -1,3 +1,7 @@ +2010-01-21 Glenn Morris <rgm@gnu.org> + + * trouble.texi (Bugs): Fix PROBLEMS keybinding. + 2010-01-12 Glenn Morris <rgm@gnu.org> * trouble.texi (Checklist): Use bug-gnu-emacs rather than
--- a/doc/emacs/trouble.texi Thu Jan 21 07:04:21 2010 +0800 +++ b/doc/emacs/trouble.texi Thu Jan 21 23:43:05 2010 +0800 @@ -419,7 +419,7 @@ Before reporting a bug, it is a good idea to see if it is already known. You can find the list of known problems in the file -@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-e} to read +@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-p} to read it. Some additional user-level problems can be found in @ref{Bugs and problems, , Bugs and problems, efaq, GNU Emacs FAQ}. Looking up your problem in these two documents might provide you with a solution or a
--- a/doc/misc/ChangeLog Thu Jan 21 07:04:21 2010 +0800 +++ b/doc/misc/ChangeLog Thu Jan 21 23:43:05 2010 +0800 @@ -1,3 +1,7 @@ +2010-01-21 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus.texi (Score File Format): Fix typo. + 2010-01-18 Juanma Barranquero <lekktu@gmail.com> * ada-mode.texi (Project File Overview): Fix typo.
--- a/doc/misc/gnus.texi Thu Jan 21 07:04:21 2010 +0800 +++ b/doc/misc/gnus.texi Thu Jan 21 23:43:05 2010 +0800 @@ -21803,7 +21803,7 @@ other. @item eval -The value of this entry will be @code{eval}el. This element will be +The value of this entry will be @code{eval}ed. This element will be ignored when handling global score files. @item read-only
--- a/lisp/ChangeLog Thu Jan 21 07:04:21 2010 +0800 +++ b/lisp/ChangeLog Thu Jan 21 23:43:05 2010 +0800 @@ -1,3 +1,12 @@ +2010-01-21 Kenichi Handa <handa@m17n.org> + + * textmodes/sgml-mode.el (sgml-maybe-name-self): No need to + process last-command-event, as it is now decoded first (Bug#5380). + +2010-01-20 Chong Yidong <cyd@stupidchicken.com> + + * term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330). + 2010-01-20 Glenn Morris <rgm@gnu.org> * indent.el (tab-always-indent): Fix custom-type.
--- a/lisp/dired-aux.el Thu Jan 21 07:04:21 2010 +0800 +++ b/lisp/dired-aux.el Thu Jan 21 23:43:05 2010 +0800 @@ -2308,7 +2308,7 @@ (restore-buffer-modified-p modflag))) ;;;###autoload -(defun dired-hide-all (arg) +(defun dired-hide-all (&optional ignored) "Hide all subdirectories, leaving only their header lines. If there is already something hidden, make everything visible again. Use \\[dired-hide-subdir] to (un)hide a particular subdirectory."
--- a/lisp/dired.el Thu Jan 21 07:04:21 2010 +0800 +++ b/lisp/dired.el Thu Jan 21 23:43:05 2010 +0800 @@ -3517,7 +3517,7 @@ ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "557aca1f6e86b39f1c7612ee123d5354") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "07676ea25af17f5d50cc5db4f53bddc0") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@ -3917,7 +3917,7 @@ If there is already something hidden, make everything visible again. Use \\[dired-hide-subdir] to (un)hide a particular subdirectory. -\(fn ARG)" t nil) +\(fn &optional IGNORED)" t nil) (autoload 'dired-isearch-filenames-setup "dired-aux" "\ Set up isearch to search in Dired file names.
--- a/lisp/term.el Thu Jan 21 07:04:21 2010 +0800 +++ b/lisp/term.el Thu Jan 21 23:43:05 2010 +0800 @@ -1208,8 +1208,17 @@ (defun term-send-raw-meta () (interactive) - (let* ((keys (this-command-keys)) - (char (aref keys (1- (length keys))))) + (let ((char last-input-event)) + (when (symbolp last-input-event) + ;; Convert `return' to C-m, etc. + (let ((tmp (get char 'event-symbol-elements))) + (when tmp + (setq char (car tmp))) + (when (symbolp char) + (setq tmp (get char 'ascii-character)) + (when tmp + (setq char tmp))))) + (setq char (event-basic-type char)) (term-send-raw-string (if (and (numberp char) (> char 127) (< char 256))
--- a/lisp/textmodes/sgml-mode.el Thu Jan 21 07:04:21 2010 +0800 +++ b/lisp/textmodes/sgml-mode.el Thu Jan 21 23:43:05 2010 +0800 @@ -608,11 +608,7 @@ "Insert a symbolic character name according to `sgml-char-names'." (interactive "*") (if sgml-name-8bit-mode - (let ((mc last-command-event)) - (if (< mc 256) - (setq mc (unibyte-char-to-multibyte mc))) - (or mc (setq mc last-command-event)) - (sgml-name-char mc)) + (sgml-name-char last-command-event) (self-insert-command 1))) (defun sgml-name-8bit-mode ()