Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100618. ------------------------------------------------------------ revno: 100618 author: Gustav Hållberg committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-06-18 19:39:04 -0700 message: * lisp/descr-text.el (describe-char): Avoid trailing whitespace. (Bug#6423) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-18 14:05:43 +0000 +++ lisp/ChangeLog 2010-06-19 02:39:04 +0000 @@ -1,3 +1,7 @@ +2010-06-19 Gustav Hållberg (tiny change) + + * descr-text.el (describe-char): Avoid trailing whitespace. (Bug#6423) + 2010-06-18 Stefan Monnier * emacs-lisp/edebug.el (edebug-read-list): === modified file 'lisp/descr-text.el' --- lisp/descr-text.el 2010-06-03 15:34:35 +0000 +++ lisp/descr-text.el 2010-06-19 02:39:04 +0000 @@ -618,7 +618,7 @@ ,@(if (not eight-bit-p) (let ((unicodedata (describe-char-unicode-data char))) (if unicodedata - (cons (list "Unicode data" " ") unicodedata)))))) + (cons (list "Unicode data" "") unicodedata)))))) (setq max-width (apply 'max (mapcar (lambda (x) (if (cadr x) (length (car x)) 0)) item-list))) @@ -642,7 +642,8 @@ (window-width)) (insert "\n") (indent-to (1+ max-width))) - (insert " " clm))) + (unless (zerop (length clm)) + (insert " " clm)))) (insert "\n")))) (when overlays ------------------------------------------------------------ revno: 100617 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2010-06-18 10:05:43 -0400 message: * lisp/emacs-lisp/edebug.el (edebug-read-list): Phase out old-style backquotes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-17 20:56:17 +0000 +++ lisp/ChangeLog 2010-06-18 14:05:43 +0000 @@ -1,3 +1,8 @@ +2010-06-18 Stefan Monnier + + * emacs-lisp/edebug.el (edebug-read-list): + Phase out old-style backquotes. + 2010-06-17 Juri Linkov * help-mode.el (help-mode): Set buffer-local variable === modified file 'lisp/emacs-lisp/edebug.el' --- lisp/emacs-lisp/edebug.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/edebug.el 2010-06-18 14:05:43 +0000 @@ -885,17 +885,12 @@ (edebug-storing-offsets (1- (point)) 'quote) (edebug-read-storing-offsets stream))) -(defvar edebug-read-backquote-level 0 - "If non-zero, we're in a new-style backquote. -It should never be negative. This controls how we read comma constructs.") - (defun edebug-read-backquote (stream) ;; Turn `thing into (\` thing) (forward-char 1) (list (edebug-storing-offsets (1- (point)) '\`) - (let ((edebug-read-backquote-level (1+ edebug-read-backquote-level))) - (edebug-read-storing-offsets stream)))) + (edebug-read-storing-offsets stream))) (defun edebug-read-comma (stream) ;; Turn ,thing into (\, thing). Handle ,@ and ,. also. @@ -910,12 +905,9 @@ (forward-char 1))) ;; Generate the same structure of offsets we would have ;; if the resulting list appeared verbatim in the input text. - (if (zerop edebug-read-backquote-level) - (edebug-storing-offsets opoint symbol) - (list - (edebug-storing-offsets opoint symbol) - (let ((edebug-read-backquote-level (1- edebug-read-backquote-level))) - (edebug-read-storing-offsets stream))))))) + (list + (edebug-storing-offsets opoint symbol) + (edebug-read-storing-offsets stream))))) (defun edebug-read-function (stream) ;; Turn #'thing into (function thing) @@ -937,17 +929,7 @@ (prog1 (let ((elements)) (while (not (memq (edebug-next-token-class) '(rparen dot))) - (if (and (eq (edebug-next-token-class) 'backquote) - (null elements) - (zerop edebug-read-backquote-level)) - (progn - ;; Old style backquote. - (forward-char 1) ; Skip backquote. - ;; Call edebug-storing-offsets here so that we - ;; produce the same offsets we would have had - ;; if the backquote were an ordinary symbol. - (push (edebug-storing-offsets (1- (point)) '\`) elements)) - (push (edebug-read-storing-offsets stream) elements))) + (push (edebug-read-storing-offsets stream) elements)) (setq elements (nreverse elements)) (if (eq 'dot (edebug-next-token-class)) (let (dotted-form) @@ -4455,7 +4437,7 @@ (add-hook 'cl-load-hook (function (lambda () (require 'cl-specs))))) -;;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu +;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu (if (featurep 'cl-read) (add-hook 'edebug-setup-hook (function (lambda () (require 'edebug-cl-read)))) @@ -4466,8 +4448,8 @@ ;;; Finalize Loading -;;; Finally, hook edebug into the rest of Emacs. -;;; There are probably some other things that could go here. +;; Finally, hook edebug into the rest of Emacs. +;; There are probably some other things that could go here. ;; Install edebug read and eval functions. (edebug-install-read-eval-functions) ------------------------------------------------------------ revno: 100616 committer: Juri Linkov branch nick: trunk timestamp: Thu 2010-06-17 23:56:17 +0300 message: Fix revert-buffer functionality of Help mode and Info. * lisp/help-mode.el (help-mode): Set buffer-local variable revert-buffer-function to help-mode-revert-buffer. (help-mode-revert-buffer): New function. * lisp/info.el (Info-revert-find-node): Check for major-mode Info-mode before popping to "*info*" (like in other Info functions). Keep buffer-name in old-buffer-name. Keep Info-history-forward in old-history-forward. Pop to old-buffer-name or "*info*" to recreate the killed buffer. Set Info-history-forward from old-history-forward. (Info-breadcrumbs-depth): Add :group and :version. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-17 16:41:13 +0000 +++ lisp/ChangeLog 2010-06-17 20:56:17 +0000 @@ -1,3 +1,17 @@ +2010-06-17 Juri Linkov + + * help-mode.el (help-mode): Set buffer-local variable + revert-buffer-function to help-mode-revert-buffer. + (help-mode-revert-buffer): New function. + + * info.el (Info-revert-find-node): Check for major-mode Info-mode + before popping to "*info*" (like in other Info functions). + Keep buffer-name in old-buffer-name. Keep Info-history-forward in + old-history-forward. Pop to old-buffer-name or "*info*" to + recreate the killed buffer. Set Info-history-forward from + old-history-forward. + (Info-breadcrumbs-depth): Add :group and :version. + 2010-06-17 Dan Nicolaescu * emacs-lisp/package.el (package-menu-mode-map): Add a menu. === modified file 'lisp/help-mode.el' --- lisp/help-mode.el 2010-05-20 23:54:55 +0000 +++ lisp/help-mode.el 2010-06-17 20:56:17 +0000 @@ -272,6 +272,9 @@ (with-current-buffer buffer (bury-buffer)))) + (set (make-local-variable 'revert-buffer-function) + 'help-mode-revert-buffer) + (run-mode-hooks 'help-mode-hook)) ;;;###autoload @@ -783,6 +786,17 @@ (fboundp sym) (facep sym)) (help-do-xref pos #'help-xref-interned (list sym))))) +(defun help-mode-revert-buffer (ignore-auto noconfirm) + (when (or noconfirm (yes-or-no-p "Revert help buffer? ")) + (let ((pos (point)) + (item help-xref-stack-item) + ;; Pretend there is no current item to add to the history. + (help-xref-stack-item nil) + ;; Use the current buffer. + (help-xref-following t)) + (apply (car item) (cdr item)) + (goto-char pos)))) + (defun help-insert-string (string) "Insert STRING to the help buffer and install xref info for it. This function can be used to restore the old contents of the help buffer === modified file 'lisp/info.el' --- lisp/info.el 2010-05-10 19:07:22 +0000 +++ lisp/info.el 2010-06-17 20:56:17 +0000 @@ -238,7 +238,9 @@ (defcustom Info-breadcrumbs-depth 4 "Depth of breadcrumbs to display. 0 means do not display breadcrumbs." - :type 'integer) + :version "23.1" + :type 'integer + :group 'info) (defcustom Info-search-whitespace-regexp "\\s-+" "If non-nil, regular expression to match a sequence of whitespace chars. @@ -800,17 +802,22 @@ "Go to an Info node FILENAME and NODENAME, re-reading disk contents. When *info* is already displaying FILENAME and NODENAME, the window position is preserved, if possible." - (pop-to-buffer "*info*") + (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*")) (let ((old-filename Info-current-file) (old-nodename Info-current-node) + (old-buffer-name (buffer-name)) (pcolumn (current-column)) (pline (count-lines (point-min) (line-beginning-position))) (wline (count-lines (point-min) (window-start))) + (old-history-forward Info-history-forward) (old-history Info-history) (new-history (and Info-current-file (list Info-current-file Info-current-node (point))))) (kill-buffer (current-buffer)) + (pop-to-buffer (or old-buffer-name "*info*")) + (Info-mode) (Info-find-node filename nodename) + (setq Info-history-forward old-history-forward) (setq Info-history old-history) (if (and (equal old-filename Info-current-file) (equal old-nodename Info-current-node))