Now on revision 105639. ------------------------------------------------------------ revno: 105639 fixes bug(s): http://debbugs.gnu.org/9391 author: Thierry Volpiatto committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-09-02 00:54:34 -0700 message: Add missing piece of earlier commit. * lisp/vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories. diff: === modified file 'lisp/vc/vc-rcs.el' --- lisp/vc/vc-rcs.el 2011-03-03 07:52:10 +0000 +++ lisp/vc/vc-rcs.el 2011-09-02 07:54:34 +0000 @@ -314,7 +314,10 @@ (defun vc-rcs-responsible-p (file) "Return non-nil if RCS thinks it would be responsible for registering FILE." ;; TODO: check for all the patterns in vc-rcs-master-templates - (file-directory-p (expand-file-name "RCS" (file-name-directory file)))) + (file-directory-p (expand-file-name "RCS" + (if (file-directory-p file) + file + (file-name-directory file))))) (defun vc-rcs-receive-file (file rev) "Implementation of receive-file for RCS." ------------------------------------------------------------ revno: 105638 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-09-01 22:38:56 -0400 message: Minor doc fix for last change. diff: === modified file 'lisp/window.el' --- lisp/window.el 2011-09-02 02:23:43 +0000 +++ lisp/window.el 2011-09-02 02:38:56 +0000 @@ -4564,16 +4564,17 @@ window, or return nil if it is unable to display the buffer. `display-buffer' constructs a list of action functions and an -action alist from `display-buffer-overriding-action', -`user-action', ACTION, and `display-buffer-default-action' (in -order). It calls each action function in turn, passing the -consolidated action alist as the second argument, until one of -the functions returns non-nil. +action alist by combining `display-buffer-overriding-action', +`display-buffer-alist', the ACTION argument, and +`display-buffer-default-action' (in that order). It calls each +action function in turn, passing the combined action alist as the +second argument, until one of the functions returns non-nil. -ACTION can also have a non-nil and non-list value. This means to -display the buffer in a window other than the selected one, even -if it is already displayed in the selected window. If called -interactively with a prefix argument, ACTION is t. +The ACTION argument to `display-buffer' can also have a non-nil +and non-list value. This means to display the buffer in a window +other than the selected one, even if it is already displayed in +the selected window. If called interactively with a prefix +argument, ACTION is t. Optional argument FRAME specifies where to look for a window that already displays the buffer. If nil, check only the selected ------------------------------------------------------------ revno: 105637 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-09-01 22:23:43 -0400 message: Split default-buffer-default into separate display action components. * lisp/window.el (display-buffer-alist): Doc fix. (display-buffer): Add docstring. Don't treat display-buffer-default specially. (display-buffer-reuse-selected-window) (display-buffer-same-window, display-buffer-maybe-same-window) (display-buffer-reuse-window, display-buffer-pop-up-frame) (display-buffer-pop-up-window) (display-buffer-reuse-or-pop-window) (display-buffer-use-some-window): New functions. (display-buffer-default-action): Use them. (display-buffer-default): Deleted. (pop-to-buffer-1): Fix choice of actions. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-02 00:36:58 +0000 +++ lisp/ChangeLog 2011-09-02 02:23:43 +0000 @@ -1,3 +1,18 @@ +2011-09-02 Chong Yidong + + * window.el (display-buffer-alist): Doc fix. + (display-buffer): Add docstring. Don't treat + display-buffer-default specially. + (display-buffer-reuse-selected-window) + (display-buffer-same-window, display-buffer-maybe-same-window) + (display-buffer-reuse-window, display-buffer-pop-up-frame) + (display-buffer-pop-up-window) + (display-buffer-reuse-or-pop-window) + (display-buffer-use-some-window): New functions. + (display-buffer-default-action): Use them. + (display-buffer-default): Deleted. + (pop-to-buffer-1): Fix choice of actions. + 2011-09-02 Stefan Monnier * minibuffer.el (completion--insert-strings): Don't get confused by === modified file 'lisp/window.el' --- lisp/window.el 2011-09-01 17:51:42 +0000 +++ lisp/window.el 2011-09-02 02:23:43 +0000 @@ -4478,155 +4478,6 @@ The actual non-nil value of this variable will be copied to the `window-dedicated-p' flag.") -(defun display-buffer-default (buffer-or-name &optional not-this-window frame) - "Make buffer BUFFER-OR-NAME appear in some window but don't select it. -BUFFER-OR-NAME must be a buffer or the name of an existing -buffer. Return the window chosen to display BUFFER-OR-NAME or -nil if no such window is found. - -Optional argument NOT-THIS-WINDOW non-nil means display the -buffer in a window other than the selected one, even if it is -already displayed in the selected window. - -Optional argument FRAME specifies which frames to investigate -when the specified buffer is already displayed. If the buffer is -already displayed in some window on one of these frames simply -return that window. Possible values of FRAME are: - -`visible' - consider windows on all visible frames on the current -terminal. - -0 - consider windows on all visible or iconified frames on the -current terminal. - -t - consider windows on all frames. - -A specific frame - consider windows on that frame only. - -nil - consider windows on the selected frame \(actually the -last non-minibuffer frame\) only. If, however, either -`display-buffer-reuse-frames' or `pop-up-frames' is non-nil -\(non-nil and not graphic-only on a text-only terminal), -consider all visible or iconified frames on the current terminal." - (interactive "BDisplay buffer:\nP") - (let* ((can-use-selected-window - ;; The selected window is usable unless either NOT-THIS-WINDOW - ;; is non-nil, it is dedicated to its buffer, or it is the - ;; `minibuffer-window'. - (not (or not-this-window - (window-dedicated-p (selected-window)) - (window-minibuffer-p)))) - (buffer (if (bufferp buffer-or-name) - buffer-or-name - (get-buffer buffer-or-name))) - (name-of-buffer (buffer-name buffer)) - ;; On text-only terminals do not pop up a new frame when - ;; `pop-up-frames' equals graphic-only. - (use-pop-up-frames (if (eq pop-up-frames 'graphic-only) - (display-graphic-p) - pop-up-frames)) - ;; `frame-to-use' is the frame where to show `buffer' - either - ;; the selected frame or the last nonminibuffer frame. - (frame-to-use - (or (window--frame-usable-p (selected-frame)) - (window--frame-usable-p (last-nonminibuffer-frame)))) - ;; `window-to-use' is the window we use for showing `buffer'. - window-to-use popped-up-frame) - (cond - ((not (buffer-live-p buffer)) - (error "No such buffer %s" buffer)) - (display-buffer-function - ;; Let `display-buffer-function' do the job. - (funcall display-buffer-function buffer not-this-window)) - ((and (not not-this-window) - (eq (window-buffer (selected-window)) buffer)) - ;; The selected window already displays BUFFER and - ;; `not-this-window' is nil, so use it. - (display-buffer-record-window 'reuse-window (selected-window) buffer) - (window--display-buffer-1 (selected-window))) - ((and can-use-selected-window (same-window-p name-of-buffer)) - ;; If the buffer's name tells us to use the selected window do so. - (display-buffer-record-window 'reuse-window (selected-window) buffer) - (window--display-buffer-2 buffer (selected-window))) - ((let ((frames (or frame - (and (or use-pop-up-frames - display-buffer-reuse-frames - (not (last-nonminibuffer-frame))) - 0) - (last-nonminibuffer-frame)))) - (setq window-to-use - (catch 'found - ;; Search frames for a window displaying BUFFER. Return - ;; the selected window only if we are allowed to do so. - (dolist (window (get-buffer-window-list buffer 'nomini frames)) - (when (or can-use-selected-window - (not (eq (selected-window) window))) - (throw 'found window)))))) - ;; The buffer is already displayed in some window; use that. - (display-buffer-record-window 'reuse-window window-to-use buffer) - (window--display-buffer-1 window-to-use)) - ((and special-display-function - ;; `special-display-p' returns either t or a list of frame - ;; parameters to pass to `special-display-function'. - (let ((pars (special-display-p name-of-buffer))) - (when pars - (funcall special-display-function - buffer (if (listp pars) pars)))))) - ((or use-pop-up-frames (not frame-to-use)) - ;; We want or need a new frame. - (setq window-to-use - (frame-selected-window (funcall pop-up-frame-function))) - (display-buffer-record-window 'pop-up-frame window-to-use buffer) - (window--display-buffer-2 buffer window-to-use)) - ((and pop-up-windows - ;; Make a new window. - (or (not (frame-parameter frame-to-use 'unsplittable)) - ;; If the selected frame cannot be split look at - ;; `last-nonminibuffer-frame'. - (and (eq frame-to-use (selected-frame)) - (setq frame-to-use (last-nonminibuffer-frame)) - (window--frame-usable-p frame-to-use) - (not (frame-parameter frame-to-use 'unsplittable)))) - ;; Attempt to split largest or least recently used window. - (setq window-to-use - (or (window--try-to-split-window - (get-largest-window frame-to-use t)) - (window--try-to-split-window - (get-lru-window frame-to-use t)))) - (display-buffer-record-window 'pop-up-window window-to-use buffer) - (window--display-buffer-2 buffer window-to-use))) - ((let ((window-to-undedicate - ;; When NOT-THIS-WINDOW is non-nil, temporarily dedicate - ;; the selected window to its buffer, to avoid that some of - ;; the `get-' routines below choose it. (Bug#1415) - (and not-this-window (not (window-dedicated-p)) - (set-window-dedicated-p (selected-window) t) - (selected-window)))) - (unwind-protect - (setq window-to-use - ;; Reuse an existing window. - (or (get-lru-window frame-to-use) - (let ((window (get-buffer-window buffer 'visible))) - (unless (and not-this-window - (eq window (selected-window))) - window)) - (get-largest-window 'visible) - (let ((window (get-buffer-window buffer 0))) - (unless (and not-this-window - (eq window (selected-window))) - window)) - (get-largest-window 0) - (prog1 - (frame-selected-window (funcall pop-up-frame-function)) - (setq popped-up-frame t)))) - (when (window-live-p window-to-undedicate) - ;; Restore dedicated status of selected window. - (set-window-dedicated-p window-to-undedicate nil)))) - (display-buffer-record-window - (if popped-up-frame 'pop-up-frame 'reuse-window) window-to-use buffer) - (window--even-window-heights window-to-use) - (window--display-buffer-2 buffer window-to-use))))) - (defun window-normalize-buffer-to-display (buffer-or-name) "Normalize BUFFER-OR-NAME argument for buffer display functions. If BUFFER-OR-NAME is nil, return the curent buffer. Else, if a @@ -4641,24 +4492,52 @@ (current-buffer))) (defvar display-buffer-alist nil - "Specifications of user preferences for `display-buffer'. -This is a list of elements of the form (CONDITION . ACTION) where -CONDITION is either a regexp matching buffer names, or a function -that takes a buffer and returns a boolean. ACTION is a list of -the form (FUNCTION . ALIST) where FUNCTION can be either a -function or a list of functions. Those functions will be called -with 2 arguments: the buffer to display and an ALIST built from -the various alists specified in the various ACTIONs. It should -either return the window used, or nil to fallback to the next -function.") - -(defvar display-buffer-default-action (list #'display-buffer-default) - "Default action to perform to display a buffer. -This is an ACTION just like in `display-buffer-alist'.") - -(defvar display-buffer-overriding-action '(nil) + "Alist of conditional actions for `display-buffer'. +This is a list of elements (CONDITION . ACTION), where: + + CONDITION is either a regexp matching buffer names, or a function + that takes a buffer and returns a boolean. + + ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is + either a function or a list of functions. Each such function + should accept 2 arguments: a buffer to display and an alist of + the same form as ALIST. It should return the window used, or + nil if it fails to display the window. See `display-buffer' + for more details. + +Usable action functions include: + `display-buffer-reuse-selected-window' + `display-buffer-same-window' + `display-buffer-maybe-same-window' + `display-buffer-reuse-window' + `display-buffer-pop-up-frame' + `display-buffer-pop-up-window' + `display-buffer-reuse-or-pop-window' + `display-buffer-use-some-window' + +The above functions recognize the following alist entries: + - `inhibit-same-window', if non-nil, prevents the same window + from being used for display. + - `reuse-frame' specifies the frames that can be searched for a + window displaying the buffer. Its values have the same + meaning as the ALL-FRAMES arg to `get-buffer-window-list'.") + +(defvar display-buffer-default-action + '((display-buffer-reuse-selected-window + display-buffer-maybe-same-window + display-buffer-reuse-or-pop-window + display-buffer-use-some-window + ;; If all else fails, pop up a new frame regardless of + ;; restrictions. + display-buffer-pop-up-frame)) + "List of default actions for `display-buffer'. +It should be a cons cell of the form (FUNCTION . ALIST), which +has the same meaning as in `display-buffer-alist'.") + +(defvar display-buffer-overriding-action nil "Overriding action to perform to display a buffer. -This is an ACTION just like in `display-buffer-alist'.") +If non-nil, it should be a cons cell (FUNCTION . ALIST), which +has the same meaning as in `display-buffer-alist'.") (defun display-buffer-assq-regexp (buffer-name alist) "Retrieve ALIST entry corresponding to BUFFER-NAME." @@ -4673,46 +4552,72 @@ (throw 'match (cdr entry))))))) (defun display-buffer (&optional buffer-or-name action frame) - "Display BUFFER in some window." + "Display BUFFER-OR-NAME in some window. +BUFFER-OR-NAME must be a buffer or the name of an existing +buffer. Return the window chosen for displaying BUFFER-OR-NAME, +or nil if no such window is found. + +Optional argument ACTION should have the form (FUNCTION . ALIST). +FUNCTION is either a function or a list of functions. Each such +function is called with 2 arguments: the buffer to display and an +alist. It should either display the buffer and return the +window, or return nil if it is unable to display the buffer. + +`display-buffer' constructs a list of action functions and an +action alist from `display-buffer-overriding-action', +`user-action', ACTION, and `display-buffer-default-action' (in +order). It calls each action function in turn, passing the +consolidated action alist as the second argument, until one of +the functions returns non-nil. + +ACTION can also have a non-nil and non-list value. This means to +display the buffer in a window other than the selected one, even +if it is already displayed in the selected window. If called +interactively with a prefix argument, ACTION is t. + +Optional argument FRAME specifies where to look for a window that +already displays the buffer. If nil, check only the selected +frame (actually the last non-minibuffer frame), except if +`display-buffer-reuse-frames' or `pop-up-frames' is non-nil +\(non-nil and not graphic-only on a text-only terminal), in which +case check all visible or iconified frames. Otherwise, FRAME can +be a specific frame, `visible' (all visible frames), 0 (all +frames on the current terminal), or t (all frames)." (interactive "BDisplay buffer:\nP") - (let* ((buffer (window-normalize-buffer-to-display buffer-or-name)) - (buffer-name (buffer-name buffer)) - (user-action - (display-buffer-assq-regexp buffer-name display-buffer-alist)) - (functions - (append - (list (car display-buffer-overriding-action)) - (list (car user-action)) - (and (listp action) (list (car action))) - (list (car display-buffer-default-action)))) - (specifiers (append (cdr display-buffer-overriding-action) - (cdr user-action) - (and (listp action) (cdr action)) - (cdr display-buffer-default-action))) - function window) - (while (and functions (not window)) - (setq function (car functions)) - (cond - ((listp function) - (while (and function (not window)) - (cond - ((eq (car function) 'display-buffer-default) - (setq window - (display-buffer-default - buffer (memq action '(t other-window)) frame))) - ((functionp (car function)) - (setq window (funcall (car function) buffer specifiers)))) - (setq function (cdr function)))) - ((eq function 'display-buffer-default) - (setq window - (display-buffer-default - buffer (memq action '(t other-window)) frame))) - ((functionp function) - (setq window - (funcall function buffer specifiers)))) - (setq functions (cdr functions))) - - window)) + (let ((buffer (window-normalize-buffer-to-display buffer-or-name)) + ;; Handle the old form of the first argument. + (inhibit-same-window (and action (not (listp action))))) + (unless (listp action) (setq action nil)) + (if display-buffer-function + ;; If `display-buffer-function' is defined, let it do the job. + (funcall display-buffer-function buffer inhibit-same-window) + ;; Otherwise, use the defined actions. + (let* ((user-action + (display-buffer-assq-regexp (buffer-name buffer) + display-buffer-alist)) + ;; Extra actions from the arguments to this function: + (extra-action + (cons nil (append (if inhibit-same-window + '((inhibit-same-window . t))) + (if frame + `((reuse-frame . ,frame)))))) + ;; Construct action function list and action alist. + (actions (list display-buffer-overriding-action + user-action action extra-action + display-buffer-default-action)) + (functions (apply 'append + (mapcar (lambda (x) + (setq x (car x)) + (if (listp x) x (list x))) + actions))) + (alist (apply 'append (mapcar 'cdr actions))) + window) + (unless (buffer-live-p buffer) + (error "Invalid buffer")) + (while (and functions (not window)) + (setq window (funcall (car functions) buffer alist) + functions (cdr functions))) + window)))) (defun display-buffer-other-frame (buffer) "Display buffer BUFFER in another frame. @@ -4737,24 +4642,182 @@ ;;(make-frame-visible (window-frame old-window)) )) -;;; Functions for use via `display-buffer-alist'. +;;; `display-buffer' action functions: + +(defun display-buffer-reuse-selected-window (buffer alist) + "Try to display BUFFER in the selected window if it is already there. +If this succeeds, return the selected window. + +This fails if BUFFER is not displayed in the selected window, or +if ALIST has a non-nil `inhibit-same-window' entry. In that +case, return nil." + (when (and (not (cdr (assq 'inhibit-same-window alist))) + (eq buffer (window-buffer))) + (display-buffer-record-window 'reuse-window (selected-window) buffer) + (window--display-buffer-1 (selected-window)))) (defun display-buffer-same-window (buffer alist) - "Display BUFFER in the selected window, and return the window. -If BUFFER cannot be displayed in the selected window (usually -because it is dedicated to another buffer), return nil." - (let ((norecord (cadr (assq 'norecord alist)))) - (cond - ((eq buffer (window-buffer)) - (selected-window)) - ((not (or (window-minibuffer-p) (window-dedicated-p))) - (set-window-buffer nil buffer) - (selected-window))))) - -(defun display-buffer-other-window (buffer alist) - "Display BUFFER in another window, and return BUFFER. -If BUFFER cannot be displayed in another window, just return nil." - (display-buffer-default buffer t)) + "Try to display BUFFER in the selected window. +If this succeeds, return the selected window. + +This fails if the selected window is a minibuffer window or is +dedicated to another buffer, or if ALIST has a non-nil +`inhibit-same-window' entry. In that case, return nil." + (unless (or (cdr (assq 'inhibit-same-window alist)) + (window-minibuffer-p) + (window-dedicated-p)) + (display-buffer-record-window 'reuse-window (selected-window) buffer) + (window--display-buffer-2 buffer (selected-window)))) + +(defun display-buffer-maybe-same-window (buffer alist) + "Try to display BUFFER in the selected window. +This acts like `display-buffer-same-window', except that it also +fails if `same-window-p' returns nil for this buffer." + (and (same-window-p (buffer-name buffer)) + (display-buffer-same-window buffer alist))) + +(defun display-buffer-reuse-window (buffer alist) + "Return a window that is already displaying BUFFER. +If no usable window is found, return nil. + +If ALIST has a non-nil `inhibit-same-window' entry, the same +window cannot be reused. + +If ALIST contains a `reuse-frame' entry, that determines the +frames to check for a window displaying the buffer. If the entry +is omitted or the value is nil, check only this frame. The value +can also be a specific frame, `visible' (all visible frames), +0 (all frames on the current terminal), or t (all frames)." + (let* ((can-use-selected-window + (not (cdr (assq 'inhibit-same-window alist)))) + (frames (or (cdr (assq 'reuse-frame alist)) + (last-nonminibuffer-frame))) + (window (catch 'found + (dolist (window (get-buffer-window-list + buffer 'nomini frames)) + (when (or can-use-selected-window + (not (eq (selected-window) window))) + (throw 'found window)))))) + (when window + (display-buffer-record-window 'reuse-window window buffer) + (window--display-buffer-1 window)))) + +(defun display-buffer-pop-up-frame (buffer alist) + "Display BUFFER in a new frame. +This works by calling `pop-up-frame-function'. If sucessful, +return the window on the new frame; otherwise return nil." + (let ((fun pop-up-frame-function) + frame window) + (when (and fun + (setq frame (funcall fun)) + (setq window (frame-selected-window frame))) + (display-buffer-record-window 'pop-up-frame window buffer) + (window--display-buffer-2 buffer window)))) + +(defun display-buffer-pop-up-window (buffer alist) + "Display BUFFER by popping up a new window. +The new window is created on the selected frame, or in +`last-nonminibuffer-frame' if no windows can be created there. +If sucessful, return the new window; otherwise return nil." + (let ((frame (or (window--frame-usable-p (selected-frame)) + (window--frame-usable-p (last-nonminibuffer-frame)))) + window) + (when (and (or (not (frame-parameter frame 'unsplittable)) + ;; If the selected frame cannot be split, look at + ;; `last-nonminibuffer-frame'. + (and (eq frame (selected-frame)) + (setq frame (last-nonminibuffer-frame)) + (window--frame-usable-p frame) + (not (frame-parameter frame 'unsplittable)))) + ;; Attempt to split largest or least recently used window. + (setq window (or (window--try-to-split-window + (get-largest-window frame t)) + (window--try-to-split-window + (get-lru-window frame t))))) + (display-buffer-record-window 'pop-up-window window buffer) + (window--display-buffer-2 buffer window)))) + +;; This display action function groups together some lower-level ones: +(defun display-buffer-reuse-or-pop-window (buffer alist) + "Display BUFFER in some window other than the selected one. +This attempts to call the following functions (in order): + - `display-buffer-reuse-window', ensuring that it checks all + frames on this terminal if `display-buffer-reuse-frames' or + `pop-up-frames' is non-nil. + - `special-display-function', if it is available. + - `display-buffer-pop-up-frame', if specified by `pop-up-frames'. + - `display-buffer-pop-up-window', if specified by `pop-up-windows'. + +If BUFFER is sucessfully display, return its window; otherwise +return nil." + (let ((use-pop-up-frames (if (eq pop-up-frames 'graphic-only) + (display-graphic-p) + pop-up-frames))) + (or (display-buffer-reuse-window + buffer + ;; If `display-buffer-reuse-frames' or `pop-up-frames' is + ;; non-nil, check all frames on this terminal. + (if (and (null (cdr (assq 'reuse-frame alist))) + (or use-pop-up-frames display-buffer-reuse-frames)) + (cons '(reuse-frame . 0) alist) + alist)) + ;; Try with `special-display-function': + (and special-display-function + ;; `special-display-p' returns either t or a list of frame + ;; parameters to pass to `special-display-function'. + (let ((pars (special-display-p (buffer-name buffer)))) + (when pars + (funcall special-display-function + buffer (if (listp pars) pars))))) + (and use-pop-up-frames + (display-buffer-pop-up-frame buffer alist)) + (and pop-up-windows + (display-buffer-pop-up-window buffer alist))))) + +(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 +return the window. If no suitable window is found, return nil." + (let* ((not-this-window (cdr (assq 'inhibit-same-window alist))) + (window-to-undedicate + ;; When NOT-THIS-WINDOW is non-nil, temporarily dedicate the + ;; selected window to its buffer, to prevent any of the + ;; `get-' routines below from choosing it. (Bug#1415) + (and not-this-window (not (window-dedicated-p)) + (set-window-dedicated-p (selected-window) t) + (selected-window))) + (frame (or (window--frame-usable-p (selected-frame)) + (window--frame-usable-p (last-nonminibuffer-frame)))) + (use-pop-up-frames (if (eq pop-up-frames 'graphic-only) + (display-graphic-p) + pop-up-frames)) + window popped-up-frame) + (unwind-protect + (setq window + ;; Reuse an existing window. + (or (get-lru-window frame) + (let ((window (get-buffer-window buffer 'visible))) + (unless (and not-this-window + (eq window (selected-window))) + window)) + (get-largest-window 'visible) + (let ((window (get-buffer-window buffer 0))) + (unless (and not-this-window + (eq window (selected-window))) + window)) + (get-largest-window 0) + (and use-pop-up-frames + (prog1 + (frame-selected-window (funcall pop-up-frame-function)) + (setq popped-up-frame t))))) + (when (window-live-p window-to-undedicate) + ;; Restore dedicated status of selected window. + (set-window-dedicated-p window-to-undedicate nil))) + (when window + (display-buffer-record-window + (if popped-up-frame 'pop-up-frame 'reuse-window) window buffer) + (window--even-window-heights window) + (window--display-buffer-2 buffer window)))) ;;; Display + selection commands: @@ -4808,12 +4871,11 @@ ;; Based on the WINDOW-CHOICE argument, choose an action ;; argument to pass to `display-buffer'. (cond - ((null window-choice) - '((display-buffer-other-window display-buffer-same-window))) ((eq window-choice 'same-window) - '((display-buffer-same-window display-buffer-other-window))) - (t - '((display-buffer-other-window))))) + '((display-buffer-reuse-selected-window + display-buffer-same-window))) + (window-choice + '(nil (inhibit-same-window . t))))) (window (display-buffer (current-buffer) action)) (frame (window-frame window))) (if (eq frame old-frame) ------------------------------------------------------------ revno: 105636 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2011-09-01 20:36:58 -0400 message: * lisp/minibuffer.el (completion--insert-strings): Don't get confused by completion entries that end with an LF char. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-01 17:51:42 +0000 +++ lisp/ChangeLog 2011-09-02 00:36:58 +0000 @@ -1,3 +1,8 @@ +2011-09-02 Stefan Monnier + + * minibuffer.el (completion--insert-strings): Don't get confused by + completion entries that end with an LF char. + 2011-09-01 Eli Zaretskii * window.el (frame-auto-delete, window-deletable-p): Doc fix. @@ -5,11 +10,11 @@ 2011-09-01 Chong Yidong * window.el (display-buffer): Restore interactive spec. - (display-buffer-same-window, display-buffer-other-window): New - functions. + (display-buffer-same-window, display-buffer-other-window): + New functions. (pop-to-buffer-1): New function. Use the above. (pop-to-buffer, pop-to-buffer-same-window): Use it. - (pop-to-buffer-other-window, pop-to-buffer-other-frame): Deleted. + (pop-to-buffer-other-window, pop-to-buffer-other-frame): Delete. * view.el (view-buffer-other-window, view-buffer-other-frame): Just use pop-to-buffer. @@ -60,8 +65,8 @@ (display-buffer-alist-set-1, display-buffer-alist-set-2) (display-buffer-alist-set): Remove. (display-buffer-function, special-display-buffer-names) - (special-display-regexps, special-display-function): In - doc-string refer to display-buffer-window and quit-restore + (special-display-regexps, special-display-function): + In doc-string refer to display-buffer-window and quit-restore parameter. (pop-up-frame-alist, pop-up-frame-function, special-display-p) (special-display-frame-alist, special-display-popup-frame) @@ -72,8 +77,8 @@ (split-window-sensibly, window--try-to-split-window) (window--frame-usable-p, even-window-heights) (window--even-window-heights, window--display-buffer-1) - (window--display-buffer-2, display-buffer-other-frame): Restore - old Emacs 23 code, order and doc-strings where applicable. + (window--display-buffer-2, display-buffer-other-frame): + Restore old Emacs 23 code, order and doc-strings where applicable. (display-buffer-default, display-buffer-assq-regexp): New functions. (display-buffer-alist): Rewrite doc-string. (display-buffer-default-action) @@ -85,8 +90,8 @@ Restore Emacs 23 behavior but use window-normalize-buffer-to-switch-to. (pop-to-buffer-same-window): Rewrite. - (pop-to-buffer-other-window, pop-to-buffer-other-frame): Rewrite - using Emacs 23 options. + (pop-to-buffer-other-window, pop-to-buffer-other-frame): + Rewrite using Emacs 23 options. 2011-08-31 Michael Albinus @@ -95,8 +100,8 @@ (tramp-completion-file-name-regexp-separate) (tramp-completion-file-name-regexp-url): Don't use leading volume letter on win32 systems. (Bug#5303, Bug#9311) - (tramp-drop-volume-letter): Simplify definition. Suggested by - Stefan Monnier . + (tramp-drop-volume-letter): Simplify definition. + Suggested by Stefan Monnier . 2011-08-30 Stefan Monnier === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-08-22 12:58:37 +0000 +++ lisp/minibuffer.el 2011-09-02 00:36:58 +0000 @@ -1076,12 +1076,15 @@ (column 0) (rows (/ (length strings) columns)) (row 0) + (first t) (laststring nil)) ;; The insertion should be "sensible" no matter what choices were made ;; for the parameters above. (dolist (str strings) (unless (equal laststring str) ; Remove (consecutive) duplicates. (setq laststring str) + ;; FIXME: `string-width' doesn't pay attention to + ;; `display' properties. (let ((length (if (consp str) (+ (string-width (car str)) (string-width (cadr str))) @@ -1100,11 +1103,11 @@ (forward-line 1) (end-of-line))) (insert " \t") - (set-text-properties (- (point) 1) (point) + (set-text-properties (1- (point)) (point) `(display (space :align-to ,column))))) (t ;; Horizontal format - (unless (bolp) + (unless first (if (< wwidth (+ (max colwidth length) column)) ;; No space for `str' at point, move to next line. (progn (insert "\n") (setq column 0)) @@ -1112,12 +1115,13 @@ ;; Leave the space unpropertized so that in the case we're ;; already past the goal column, there is still ;; a space displayed. - (set-text-properties (- (point) 1) (point) + (set-text-properties (1- (point)) (point) ;; We can't just set tab-width, because ;; completion-setup-function will kill ;; all local variables :-( `(display (space :align-to ,column))) nil)))) + (setq first nil) (if (not (consp str)) (put-text-property (point) (progn (insert str) (point)) 'mouse-face 'highlight) ------------------------------------------------------------ revno: 105635 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-09-01 20:51:42 +0300 message: lisp/window.el (frame-auto-delete, window-deletable-p): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-01 17:04:30 +0000 +++ lisp/ChangeLog 2011-09-01 17:51:42 +0000 @@ -1,3 +1,7 @@ +2011-09-01 Eli Zaretskii + + * window.el (frame-auto-delete, window-deletable-p): Doc fix. + 2011-09-01 Chong Yidong * window.el (display-buffer): Restore interactive spec. === modified file 'lisp/window.el' --- lisp/window.el 2011-09-01 17:04:30 +0000 +++ lisp/window.el 2011-09-01 17:51:42 +0000 @@ -2259,10 +2259,10 @@ ;;; Deleting windows. (defcustom frame-auto-delete 'automatic - "If non-nil, quitting a window can delete it's frame. + "If non-nil, quitting a window can delete its frame. If this variable is nil, functions that quit a window never -delete the associated frame. If this variable equals the symbol -`automatic', a frame is deleted only if it the window is +delete the associated frame. If this variable's value is the +symbol `automatic', a frame is deleted only if the window is dedicated or was created by `display-buffer'. If this variable is t, a frame can be always deleted, even if it was created by `make-frame-command'. Other values should not be used. @@ -2282,8 +2282,8 @@ (defun window-deletable-p (&optional window) "Return t if WINDOW can be safely deleted from its frame. -Return `frame' if deleting WINDOW should delete its frame -instead." +Return `frame' if deleting WINDOW should also delete its +frame." (setq window (window-normalize-any-window window)) (unless ignore-window-parameters ;; Handle atomicity. @@ -2304,7 +2304,7 @@ (other-visible-frames-p frame)) ;; WINDOW is the root window of its frame. Return `frame' but ;; only if WINDOW is (1) either dedicated or quit-restore's car - ;; is new-frame and the window still displays the same buffer + ;; is `new-frame' and the window still displays the same buffer ;; and (2) there are other frames left. 'frame)) ((and (not ignore-window-parameters) ------------------------------------------------------------ revno: 105634 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-09-01 13:04:30 -0400 message: Fix display-buffer interactive spec, and fixes for pop-to-buffer*. * lisp/window.el (display-buffer): Restore interactive spec. (display-buffer-same-window, display-buffer-other-window): New functions. (pop-to-buffer-1): New function. Use the above. (pop-to-buffer, pop-to-buffer-same-window): Use it. (pop-to-buffer-other-window, pop-to-buffer-other-frame): Deleted. * lisp/view.el (view-buffer-other-window, view-buffer-other-frame): Just use pop-to-buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-01 07:34:08 +0000 +++ lisp/ChangeLog 2011-09-01 17:04:30 +0000 @@ -1,3 +1,15 @@ +2011-09-01 Chong Yidong + + * window.el (display-buffer): Restore interactive spec. + (display-buffer-same-window, display-buffer-other-window): New + functions. + (pop-to-buffer-1): New function. Use the above. + (pop-to-buffer, pop-to-buffer-same-window): Use it. + (pop-to-buffer-other-window, pop-to-buffer-other-frame): Deleted. + + * view.el (view-buffer-other-window, view-buffer-other-frame): + Just use pop-to-buffer. + 2011-09-01 Thierry Volpiatto * vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories. (Bug#9391) === modified file 'lisp/view.el' --- lisp/view.el 2011-08-24 17:38:46 +0000 +++ lisp/view.el 2011-09-01 17:04:30 +0000 @@ -338,7 +338,8 @@ argument. This function is called when finished viewing buffer. Use this argument instead of explicitly setting `view-exit-action'." (interactive "bIn other window view buffer:\nP") - (pop-to-buffer-other-window buffer) + (let ((pop-up-windows t)) + (pop-to-buffer buffer t)) (view-mode-enter nil exit-action)) ;;;###autoload @@ -358,7 +359,8 @@ argument. This function is called when finished viewing buffer. Use this argument instead of explicitly setting `view-exit-action'." (interactive "bView buffer in other frame: \nP") - (pop-to-buffer-other-frame buffer) + (let ((pop-up-frames t)) + (pop-to-buffer buffer t)) (view-mode-enter nil exit-action)) ;;;###autoload === modified file 'lisp/window.el' --- lisp/window.el 2011-08-31 09:27:49 +0000 +++ lisp/window.el 2011-09-01 17:04:30 +0000 @@ -4674,6 +4674,7 @@ (defun display-buffer (&optional buffer-or-name action frame) "Display BUFFER in some window." + (interactive "BDisplay buffer:\nP") (let* ((buffer (window-normalize-buffer-to-display buffer-or-name)) (buffer-name (buffer-name buffer)) (user-action @@ -4736,6 +4737,27 @@ ;;(make-frame-visible (window-frame old-window)) )) +;;; Functions for use via `display-buffer-alist'. + +(defun display-buffer-same-window (buffer alist) + "Display BUFFER in the selected window, and return the window. +If BUFFER cannot be displayed in the selected window (usually +because it is dedicated to another buffer), return nil." + (let ((norecord (cadr (assq 'norecord alist)))) + (cond + ((eq buffer (window-buffer)) + (selected-window)) + ((not (or (window-minibuffer-p) (window-dedicated-p))) + (set-window-buffer nil buffer) + (selected-window))))) + +(defun display-buffer-other-window (buffer alist) + "Display BUFFER in another window, and return BUFFER. +If BUFFER cannot be displayed in another window, just return nil." + (display-buffer-default buffer t)) + +;;; Display + selection commands: + (defun pop-to-buffer (buffer-or-name &optional other-window norecord) "Select buffer BUFFER-OR-NAME in some window, preferably a different one. BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or @@ -4759,20 +4781,7 @@ Optional third arg NORECORD non-nil means do not put this buffer at the front of the list of recently selected ones." (interactive "BPop to buffer:\nP") - (let ((buffer (window-normalize-buffer-to-display buffer-or-name)) - (old-window (selected-window)) - (old-frame (selected-frame)) - new-window new-frame) - (set-buffer buffer) - (setq new-window (display-buffer buffer other-window)) - (setq new-frame (window-frame new-window)) - (if (eq old-frame new-frame) - ;; Make sure new-window gets selected (Bug#8615), (Bug#6954). - (select-window new-window norecord) - ;; `display-buffer' has chosen another frame, make sure it gets - ;; input focus and is risen. - (select-frame-set-input-focus new-frame norecord)) - buffer)) + (pop-to-buffer-1 buffer-or-name (if other-window t nil) norecord)) (defun pop-to-buffer-same-window (&optional buffer-or-name norecord) "Pop to buffer specified by BUFFER-OR-NAME in the selected window. @@ -4781,40 +4790,39 @@ buffer. Optional arguments BUFFER-OR-NAME and NORECORD are as for `pop-to-buffer'." (interactive "BPop to buffer in selected window:\nP") - (let ((buffer (window-normalize-buffer-to-display buffer-or-name))) - (cond - ((eq buffer (window-buffer)) - (unless norecord - (select-window (selected-window))) - (set-buffer buffer)) - ((or (window-minibuffer-p) (window-dedicated-p)) - (pop-to-buffer buffer norecord)) - (t - (set-window-buffer nil buffer) - (unless norecord - (select-window (selected-window))) - (set-buffer buffer))))) - -(defun pop-to-buffer-other-window (&optional buffer-or-name norecord) - "Pop to buffer specified by BUFFER-OR-NAME in another window. -The selected window will be used only if there is no other -choice. Windows on the selected frame are preferred to windows -on other frames. Optional arguments BUFFER-OR-NAME and NORECORD -are as for `pop-to-buffer'." - (interactive "BPop to buffer in another window:\nP") - (let ((pop-up-windows t) - same-window-buffer-names same-window-regexps) - (pop-to-buffer buffer-or-name t norecord))) - -(defun pop-to-buffer-other-frame (&optional buffer-or-name norecord) - "Pop to buffer specified by BUFFER-OR-NAME on another frame. -The selected frame will be used only if there's no other choice. -Optional arguments BUFFER-OR-NAME and NORECORD are as for -`pop-to-buffer'." - (interactive "BPop to buffer on another frame:\nP") - (let ((pop-up-frames t) - same-window-buffer-names same-window-regexps) - (pop-to-buffer buffer-or-name t norecord))) + (pop-to-buffer-1 buffer-or-name 'same-window norecord)) + +(defun pop-to-buffer-1 (buffer-or-name window-choice norecord) + (set-buffer (window-normalize-buffer-to-display + ;; BUFFER-OR-NAME nil means another buffer. + (or buffer-or-name + (other-buffer (current-buffer))))) + (let ((old-window (selected-window)) + (old-frame (selected-frame)) + (same-window-buffer-names same-window-buffer-names) + (same-window-regexps same-window-regexps)) + (if (eq window-choice t) + (setq same-window-buffer-names nil + same-window-regexps nil)) + (let* ((action + ;; Based on the WINDOW-CHOICE argument, choose an action + ;; argument to pass to `display-buffer'. + (cond + ((null window-choice) + '((display-buffer-other-window display-buffer-same-window))) + ((eq window-choice 'same-window) + '((display-buffer-same-window display-buffer-other-window))) + (t + '((display-buffer-other-window))))) + (window (display-buffer (current-buffer) action)) + (frame (window-frame window))) + (if (eq frame old-frame) + ;; Make sure new window gets selected (Bug#8615), (Bug#6954). + (select-window window norecord) + ;; If `display-buffer' has chosen another frame, make sure it + ;; gets input focus. + (select-frame-set-input-focus frame norecord)) + (current-buffer)))) (defun read-buffer-to-switch (prompt) "Read the name of a buffer to switch to, prompting with PROMPT. ------------------------------------------------------------ revno: 105633 author: Andrew Cohen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-09-01 13:25:09 +0000 message: gnus-sum.el: When adding article headers to a summary buffer also update gnus-newsgroup-articles (bug#9386). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-08-30 23:01:50 +0000 +++ lisp/gnus/ChangeLog 2011-09-01 13:25:09 +0000 @@ -1,3 +1,8 @@ +2011-09-01 Andrew Cohen + + * gnus-sum.el: When adding article headers to a summary buffer also + update gnus-newsgroup-articles (bug#9386). + 2011-08-30 Katsumi Yamaoka * auth-source.el: Autoload help-mode. === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-08-21 22:10:49 +0000 +++ lisp/gnus/gnus-sum.el 2011-09-01 13:25:09 +0000 @@ -8630,6 +8630,8 @@ 'list gnus-newsgroup-headers (gnus-fetch-headers articles nil t) 'gnus-article-sort-by-number)) + (setq gnus-newsgroup-articles + (gnus-sorted-nunion gnus-newsgroup-articles articles)) (gnus-summary-limit (append articles gnus-newsgroup-limit)))) (defun gnus-summary-limit-exclude-dormant () @@ -9022,9 +9024,11 @@ (keep-lines (regexp-opt ',(append refs (list id subject))))))) (gnus-fetch-headers (list last) (if (numberp limit) - (* 2 limit) limit) t))))) + (* 2 limit) limit) t)))) + article-ids) (when (listp new-headers) (dolist (header new-headers) + (push (mail-header-number header) article-ids) (when (member (mail-header-number header) gnus-newsgroup-unselected) (push (mail-header-number header) gnus-newsgroup-unreads) (setq gnus-newsgroup-unselected @@ -9035,6 +9039,8 @@ (gnus-merge 'list gnus-newsgroup-headers new-headers 'gnus-article-sort-by-number))) + (setq gnus-newsgroup-articles + (gnus-sorted-nunion gnus-newsgroup-articles (nreverse article-ids))) (gnus-summary-limit-include-thread id)))) (defun gnus-summary-refer-article (message-id) @@ -12743,6 +12749,8 @@ gnus-newsgroup-headers (gnus-fetch-headers articles) 'gnus-article-sort-by-number)) + (setq gnus-newsgroup-articles + (gnus-sorted-nunion gnus-newsgroup-articles articles)) ;; Suppress duplicates? (when gnus-suppress-duplicates (gnus-dup-suppress-articles)) ------------------------------------------------------------ revno: 105632 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-09-01 06:18:38 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-08-04 00:58:07 +0000 +++ lisp/ldefs-boot.el 2011-09-01 10:18:38 +0000 @@ -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" -;;;;;; (19931 11784)) +;;;;;; (20033 22846)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -1478,7 +1478,7 @@ ;;;*** ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el" -;;;;;; (19985 37722)) +;;;;;; (20062 2656)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1768,7 +1768,7 @@ ;;;*** ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el" -;;;;;; (19976 22732)) +;;;;;; (20055 29424)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -2282,7 +2282,7 @@ ;;;;;; browse-url-at-mouse browse-url-at-point browse-url browse-url-of-region ;;;;;; browse-url-of-dired-file browse-url-of-buffer browse-url-of-file ;;;;;; browse-url-browser-function) "browse-url" "net/browse-url.el" -;;;;;; (19997 54906)) +;;;;;; (20048 56149)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -3059,7 +3059,7 @@ ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (20015 58840)) +;;;;;; (20048 56149)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -4297,8 +4297,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" (19997 -;;;;;; 28887)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20051 +;;;;;; 32345)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -5070,7 +5070,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" (19996 8027)) +;;;;;; "cus-edit" "cus-edit.el" (20025 8284)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5384,8 +5384,8 @@ ;;;*** ;;;### (autoloads (customize-themes describe-theme custom-theme-visit-theme -;;;;;; customize-create-theme) "cus-theme" "cus-theme.el" (19980 -;;;;;; 19797)) +;;;;;; customize-create-theme) "cus-theme" "cus-theme.el" (20059 +;;;;;; 26455)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5703,7 +5703,7 @@ ;;;*** ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug" -;;;;;; "emacs-lisp/debug.el" (19999 41685)) +;;;;;; "emacs-lisp/debug.el" (20051 32345)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5883,7 +5883,7 @@ ;;;*** ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode) -;;;;;; "derived" "emacs-lisp/derived.el" (19988 13913)) +;;;;;; "derived" "emacs-lisp/derived.el" (20054 8529)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5906,10 +5906,10 @@ Declare the customization group that corresponds to this mode. The command `customize-mode' uses this. :syntax-table TABLE - Use TABLE instead of the default. + Use TABLE instead of the default (CHILD-syntax-table). A nil value means to simply use the same syntax-table as the parent. :abbrev-table TABLE - Use TABLE instead of the default. + Use TABLE instead of the default (CHILD-abbrev-table). A nil value means to simply use the same abbrev-table as the parent. Here is how you could define LaTeX-Thesis mode as a variant of LaTeX mode: @@ -6322,7 +6322,7 @@ ;;;*** ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window -;;;;;; dired dired-listing-switches) "dired" "dired.el" (20019 55931)) +;;;;;; dired dired-listing-switches) "dired" "dired.el" (20045 30688)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -7516,7 +7516,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" (19863 8742)) +;;;;;; "emacs-lisp/edebug.el" (20050 11479)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -8292,8 +8292,8 @@ ;;;;;; epa-sign-region epa-verify-cleartext-in-region epa-verify-region ;;;;;; epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file ;;;;;; epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys -;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (19865 -;;;;;; 50420)) +;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20042 +;;;;;; 17367)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8339,7 +8339,12 @@ (autoload 'epa-decrypt-region "epa" "\ Decrypt the current region between START and END. -Don't use this command in Lisp programs! +If MAKE-BUFFER-FUNCTION is non-nil, call it to prepare an output buffer. +It should return that buffer. If it copies the input, it should +delete the text now being decrypted. It should leave point at the +proper place to insert the plaintext. + +Be careful about using this command in Lisp programs! Since this function operates on regions, it does some tricks such as coding-system detection and unibyte/multibyte conversion. If you are sure how the data in the region should be treated, you @@ -8354,7 +8359,7 @@ (epg-decrypt-string context (buffer-substring start end)) 'utf-8)) -\(fn START END)" t nil) +\(fn START END &optional MAKE-BUFFER-FUNCTION)" t nil) (autoload 'epa-decrypt-armor-in-region "epa" "\ Decrypt OpenPGP armors in the current region between START and END. @@ -8492,7 +8497,7 @@ ;;;*** ;;;### (autoloads (epa-file-disable epa-file-enable epa-file-handler) -;;;;;; "epa-file" "epa-file.el" (19865 50420)) +;;;;;; "epa-file" "epa-file.el" (20038 20303)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8514,7 +8519,7 @@ ;;;### (autoloads (epa-global-mail-mode epa-mail-import-keys epa-mail-encrypt ;;;;;; epa-mail-sign epa-mail-verify epa-mail-decrypt epa-mail-mode) -;;;;;; "epa-mail" "epa-mail.el" (19865 50420)) +;;;;;; "epa-mail" "epa-mail.el" (20043 38232)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8578,7 +8583,7 @@ ;;;*** -;;;### (autoloads (epg-make-context) "epg" "epg.el" (19865 50420)) +;;;### (autoloads (epg-make-context) "epg" "epg.el" (20031 47065)) ;;; Generated autoloads from epg.el (autoload 'epg-make-context "epg" "\ @@ -8639,7 +8644,7 @@ `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will be invoked for the values of the other parameters. -\(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port)) (NICK (erc-compute-nick)) PASSWORD (FULL-NAME (erc-compute-full-name)))" t nil) +\(fn &key (server (erc-compute-server)) (port (erc-compute-port)) (nick (erc-compute-nick)) PASSWORD (full-name (erc-compute-full-name)))" t nil) (defalias 'erc-select 'erc) @@ -10582,7 +10587,7 @@ ;;;;;; find-variable find-variable-noselect find-function-other-frame ;;;;;; find-function-other-window find-function find-function-noselect ;;;;;; find-function-search-for-symbol find-library) "find-func" -;;;;;; "emacs-lisp/find-func.el" (19981 40664)) +;;;;;; "emacs-lisp/find-func.el" (20050 11479)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10611,11 +10616,15 @@ not selected. If the function definition can't be found in the buffer, returns (BUFFER). +If FUNCTION is a built-in function, this function normally +attempts to find it in the Emacs C sources; however, if LISP-ONLY +is non-nil, signal an error instead. + If the file where FUNCTION is defined is not known, then it is searched for in `find-function-source-path' if non-nil, otherwise in `load-path'. -\(fn FUNCTION)" nil nil) +\(fn FUNCTION &optional LISP-ONLY)" nil nil) (autoload 'find-function "find-func" "\ Find the definition of the FUNCTION near point. @@ -11377,7 +11386,7 @@ ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (20006 43871)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (20027 50006)) ;;; Generated autoloads from gnus/gnus.el (when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) @@ -11430,7 +11439,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" (19953 61266)) +;;;;;; "gnus/gnus-agent.el" (20048 56149)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11521,7 +11530,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (20022 32083)) +;;;;;; (20050 11479)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11739,7 +11748,7 @@ ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (20006 43871)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (20062 2656)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -11757,7 +11766,7 @@ ;;;*** ;;;### (autoloads (gnus-html-prefetch-images gnus-article-html) "gnus-html" -;;;;;; "gnus/gnus-html.el" (20006 43871)) +;;;;;; "gnus/gnus-html.el" (20050 11479)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -11914,7 +11923,7 @@ ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (19990 55648)) +;;;;;; "gnus-msg" "gnus/gnus-msg.el" (20055 29424)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12080,7 +12089,7 @@ ;;;*** ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el" -;;;;;; (19845 45374)) +;;;;;; (20046 14433)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12102,7 +12111,7 @@ ;;;*** ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" -;;;;;; (20022 32083)) +;;;;;; (20050 11479)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12242,7 +12251,7 @@ ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (19989 34789)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20050 11479)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12722,7 +12731,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" (19977 43600)) +;;;;;; "help-fns" "help-fns.el" (20029 5330)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -12818,18 +12827,9 @@ ;;;### (autoloads (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" (19958 -;;;;;; 33091)) +;;;;;; help-mode-setup) "help-mode" "help-mode.el" (20059 26455)) ;;; Generated autoloads from help-mode.el -(autoload 'help-mode "help-mode" "\ -Major mode for viewing help text and navigating references in it. -Entry to this mode runs the normal hook `help-mode-hook'. -Commands: -\\{help-mode-map} - -\(fn)" t nil) - (autoload 'help-mode-setup "help-mode" "\ @@ -13025,7 +13025,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" -;;;;;; (19845 45374)) +;;;;;; (20034 23247)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13803,7 +13803,7 @@ ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (19886 45771)) +;;;;;; "ibuffer" "ibuffer.el" (20053 39261)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14119,8 +14119,8 @@ ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19931 -;;;;;; 11784)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20025 +;;;;;; 8284)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14607,7 +14607,7 @@ ;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag ;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs ;;;;;; image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs) -;;;;;; "image-dired" "image-dired.el" (19931 11784)) +;;;;;; "image-dired" "image-dired.el" (20033 22846)) ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ @@ -15065,7 +15065,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-manual -;;;;;; info info-other-window) "info" "info.el" (20000 30124)) +;;;;;; info info-other-window) "info" "info.el" (20031 47065)) ;;; Generated autoloads from info.el (autoload 'info-other-window "info" "\ @@ -15188,7 +15188,7 @@ \\[Info-scroll-down] Normally, scroll backward. If the beginning of the buffer is already visible, try to go to the previous menu entry, or up if there is none. -\\[Info-beginning-of-buffer] Go to beginning of node. +\\[beginning-of-buffer] Go to beginning of node. Advanced commands: \\[Info-search] Search through this Info file for specified regexp, @@ -15571,7 +15571,7 @@ ;;;;;; ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell ;;;;;; ispell-help ispell-pdict-save ispell-word ispell-personal-dictionary) -;;;;;; "ispell" "textmodes/ispell.el" (19905 10215)) +;;;;;; "ispell" "textmodes/ispell.el" (20055 29424)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -15918,7 +15918,7 @@ ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19981 40664)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20038 20303)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -16527,8 +16527,8 @@ ;;;*** -;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19984 -;;;;;; 16846)) +;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (20031 +;;;;;; 47065)) ;;; Generated autoloads from longlines.el (autoload 'longlines-mode "longlines" "\ @@ -16537,8 +16537,8 @@ `fill-column'. The soft newlines used for line wrapping will not show up when the text is yanked or saved to disk. -With no argument, this command toggles Flyspell mode. -With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive, +With no argument, this command toggles Long Lines mode. +With a prefix argument ARG, turn Long Lines minor mode on if ARG is positive, otherwise turn it off. If the variable `longlines-auto-wrap' is non-nil, lines are automatically @@ -17273,7 +17273,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" (20006 43871)) +;;;;;; "gnus/message.el" (20047 35303)) ;;; 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) @@ -17938,7 +17938,7 @@ ;;;*** ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el" -;;;;;; (19940 49234)) +;;;;;; (20026 29156)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -17955,7 +17955,7 @@ ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt ;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt) -;;;;;; "mml2015" "gnus/mml2015.el" (19981 40664)) +;;;;;; "mml2015" "gnus/mml2015.el" (20059 26455)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18146,7 +18146,7 @@ ;;;*** -;;;### (autoloads (mpc) "mpc" "mpc.el" (19946 1612)) +;;;### (autoloads (mpc) "mpc" "mpc.el" (20052 53218)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18579,7 +18579,7 @@ ;;;*** ;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el" -;;;;;; (19990 55648)) +;;;;;; (20044 59100)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19146,7 +19146,7 @@ ;;;;;; org-babel-pop-to-session-maybe org-babel-load-in-session-maybe ;;;;;; org-babel-expand-src-block-maybe org-babel-view-src-block-info ;;;;;; org-babel-execute-maybe org-babel-execute-safely-maybe) "ob" -;;;;;; "org/ob.el" (20021 11227)) +;;;;;; "org/ob.el" (20045 31431)) ;;; Generated autoloads from org/ob.el (autoload 'org-babel-execute-safely-maybe "ob" "\ @@ -19349,7 +19349,7 @@ ;;;*** ;;;### (autoloads (org-babel-describe-bindings) "ob-keys" "org/ob-keys.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30710)) ;;; Generated autoloads from org/ob-keys.el (autoload 'org-babel-describe-bindings "ob-keys" "\ @@ -19360,7 +19360,7 @@ ;;;*** ;;;### (autoloads (org-babel-lob-get-info org-babel-lob-execute-maybe -;;;;;; org-babel-lob-ingest) "ob-lob" "org/ob-lob.el" (20018 35031)) +;;;;;; org-babel-lob-ingest) "ob-lob" "org/ob-lob.el" (20045 31431)) ;;; Generated autoloads from org/ob-lob.el (autoload 'org-babel-lob-ingest "ob-lob" "\ @@ -19385,7 +19385,7 @@ ;;;### (autoloads (org-babel-tangle org-babel-tangle-file org-babel-load-file ;;;;;; org-babel-tangle-lang-exts) "ob-tangle" "org/ob-tangle.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30712)) ;;; Generated autoloads from org/ob-tangle.el (defvar org-babel-tangle-lang-exts '(("emacs-lisp" . "el")) "\ @@ -19538,7 +19538,7 @@ ;;;;;; org-insert-link-global org-store-link org-run-like-in-org-mode ;;;;;; turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle ;;;;;; org-mode org-babel-do-load-languages) "org" "org/org.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30720)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19762,7 +19762,7 @@ ;;;;;; org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda -;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (20018 35031)) +;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (20045 30712)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-agenda "org-agenda" "\ @@ -20007,7 +20007,7 @@ ;;;### (autoloads (org-archive-subtree-default-with-confirmation ;;;;;; org-archive-subtree-default) "org-archive" "org/org-archive.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30713)) ;;; Generated autoloads from org/org-archive.el (autoload 'org-archive-subtree-default "org-archive" "\ @@ -20027,8 +20027,8 @@ ;;;### (autoloads (org-export-as-ascii org-export-region-as-ascii ;;;;;; org-replace-region-by-ascii org-export-as-ascii-to-buffer ;;;;;; org-export-as-utf8-to-buffer org-export-as-utf8 org-export-as-latin1-to-buffer -;;;;;; org-export-as-latin1) "org-ascii" "org/org-ascii.el" (20018 -;;;;;; 35031)) +;;;;;; org-export-as-latin1) "org-ascii" "org/org-ascii.el" (20045 +;;;;;; 30713)) ;;; Generated autoloads from org/org-ascii.el (autoload 'org-export-as-latin1 "org-ascii" "\ @@ -20101,8 +20101,8 @@ ;;;*** -;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (20018 -;;;;;; 35031)) +;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (20045 +;;;;;; 30713)) ;;; Generated autoloads from org/org-attach.el (autoload 'org-attach "org-attach" "\ @@ -20114,7 +20114,7 @@ ;;;*** ;;;### (autoloads (org-bbdb-anniversaries) "org-bbdb" "org/org-bbdb.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30713)) ;;; Generated autoloads from org/org-bbdb.el (autoload 'org-bbdb-anniversaries "org-bbdb" "\ @@ -20125,7 +20125,7 @@ ;;;*** ;;;### (autoloads (org-capture-import-remember-templates org-capture-insert-template-here -;;;;;; org-capture) "org-capture" "org/org-capture.el" (20018 35031)) +;;;;;; org-capture) "org-capture" "org/org-capture.el" (20045 30713)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture "org-capture" "\ @@ -20163,7 +20163,7 @@ ;;;*** ;;;### (autoloads (org-clock-persistence-insinuate org-get-clocktable) -;;;;;; "org-clock" "org/org-clock.el" (20018 35031)) +;;;;;; "org-clock" "org/org-clock.el" (20045 30713)) ;;; Generated autoloads from org/org-clock.el (autoload 'org-get-clocktable "org-clock" "\ @@ -20181,7 +20181,7 @@ ;;;*** ;;;### (autoloads (org-datetree-find-date-create) "org-datetree" -;;;;;; "org/org-datetree.el" (20018 35031)) +;;;;;; "org/org-datetree.el" (20045 30713)) ;;; Generated autoloads from org/org-datetree.el (autoload 'org-datetree-find-date-create "org-datetree" "\ @@ -20197,7 +20197,7 @@ ;;;### (autoloads (org-export-as-docbook org-export-as-docbook-pdf-and-open ;;;;;; org-export-as-docbook-pdf org-export-region-as-docbook org-replace-region-by-docbook ;;;;;; org-export-as-docbook-to-buffer org-export-as-docbook-batch) -;;;;;; "org-docbook" "org/org-docbook.el" (20018 35031)) +;;;;;; "org-docbook" "org/org-docbook.el" (20045 30713)) ;;; Generated autoloads from org/org-docbook.el (autoload 'org-export-as-docbook-batch "org-docbook" "\ @@ -20274,7 +20274,7 @@ ;;;### (autoloads (org-insert-export-options-template org-export-as-org ;;;;;; org-export-visible org-export) "org-exp" "org/org-exp.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30715)) ;;; Generated autoloads from org/org-exp.el (autoload 'org-export "org-exp" "\ @@ -20335,8 +20335,8 @@ ;;;*** ;;;### (autoloads (org-feed-show-raw-feed org-feed-goto-inbox org-feed-update -;;;;;; org-feed-update-all) "org-feed" "org/org-feed.el" (20018 -;;;;;; 35031)) +;;;;;; org-feed-update-all) "org-feed" "org/org-feed.el" (20045 +;;;;;; 30715)) ;;; Generated autoloads from org/org-feed.el (autoload 'org-feed-update-all "org-feed" "\ @@ -20364,7 +20364,7 @@ ;;;*** ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote" -;;;;;; "org/org-footnote.el" (20018 35031)) +;;;;;; "org/org-footnote.el" (20045 30715)) ;;; Generated autoloads from org/org-footnote.el (autoload 'org-footnote-action "org-footnote" "\ @@ -20415,7 +20415,7 @@ ;;;### (autoloads (org-freemind-to-org-mode org-freemind-from-org-sparse-tree ;;;;;; org-freemind-from-org-mode org-freemind-from-org-mode-node ;;;;;; org-freemind-show org-export-as-freemind) "org-freemind" -;;;;;; "org/org-freemind.el" (20018 35031)) +;;;;;; "org/org-freemind.el" (20045 31431)) ;;; Generated autoloads from org/org-freemind.el (autoload 'org-export-as-freemind "org-freemind" "\ @@ -20476,7 +20476,7 @@ ;;;### (autoloads (org-export-htmlize-generate-css org-export-as-html ;;;;;; org-export-region-as-html org-replace-region-by-html org-export-as-html-to-buffer ;;;;;; org-export-as-html-batch org-export-as-html-and-open) "org-html" -;;;;;; "org/org-html.el" (20018 35031)) +;;;;;; "org/org-html.el" (20045 30715)) ;;; Generated autoloads from org/org-html.el (put 'org-export-html-style-include-default 'safe-local-variable 'booleanp) @@ -20570,7 +20570,7 @@ ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files ;;;;;; org-export-icalendar-this-file) "org-icalendar" "org/org-icalendar.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30716)) ;;; Generated autoloads from org/org-icalendar.el (autoload 'org-export-icalendar-this-file "org-icalendar" "\ @@ -20598,7 +20598,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" -;;;;;; (20018 35031)) +;;;;;; (20045 30716)) ;;; Generated autoloads from org/org-id.el (autoload 'org-id-get-create "org-id" "\ @@ -20667,7 +20667,7 @@ ;;;*** ;;;### (autoloads (org-indent-mode) "org-indent" "org/org-indent.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30716)) ;;; Generated autoloads from org/org-indent.el (autoload 'org-indent-mode "org-indent" "\ @@ -20682,7 +20682,7 @@ ;;;*** ;;;### (autoloads (org-irc-store-link) "org-irc" "org/org-irc.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30716)) ;;; Generated autoloads from org/org-irc.el (autoload 'org-irc-store-link "org-irc" "\ @@ -20695,7 +20695,7 @@ ;;;### (autoloads (org-export-as-pdf-and-open org-export-as-pdf org-export-as-latex ;;;;;; org-export-region-as-latex org-replace-region-by-latex org-export-as-latex-to-buffer ;;;;;; org-export-as-latex-batch) "org-latex" "org/org-latex.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30716)) ;;; Generated autoloads from org/org-latex.el (autoload 'org-export-as-latex-batch "org-latex" "\ @@ -20775,8 +20775,8 @@ ;;;*** ;;;### (autoloads (org-mobile-create-sumo-agenda org-mobile-pull -;;;;;; org-mobile-push) "org-mobile" "org/org-mobile.el" (20018 -;;;;;; 35031)) +;;;;;; org-mobile-push) "org-mobile" "org/org-mobile.el" (20045 +;;;;;; 30717)) ;;; Generated autoloads from org/org-mobile.el (autoload 'org-mobile-push "org-mobile" "\ @@ -20801,7 +20801,7 @@ ;;;*** ;;;### (autoloads (org-plot/gnuplot) "org-plot" "org/org-plot.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30717)) ;;; Generated autoloads from org/org-plot.el (autoload 'org-plot/gnuplot "org-plot" "\ @@ -20815,7 +20815,7 @@ ;;;### (autoloads (org-publish-current-project org-publish-current-file ;;;;;; org-publish-all org-publish) "org-publish" "org/org-publish.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30718)) ;;; Generated autoloads from org/org-publish.el (defalias 'org-publish-project 'org-publish) @@ -20849,7 +20849,7 @@ ;;;### (autoloads (org-remember-handler org-remember org-remember-apply-template ;;;;;; org-remember-annotation org-remember-insinuate) "org-remember" -;;;;;; "org/org-remember.el" (20018 35031)) +;;;;;; "org/org-remember.el" (20045 30718)) ;;; Generated autoloads from org/org-remember.el (autoload 'org-remember-insinuate "org-remember" "\ @@ -20925,7 +20925,7 @@ ;;;*** ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl) -;;;;;; "org-table" "org/org-table.el" (20018 35031)) +;;;;;; "org-table" "org/org-table.el" (20045 30718)) ;;; Generated autoloads from org/org-table.el (autoload 'turn-on-orgtbl "org-table" "\ @@ -20949,7 +20949,7 @@ ;;;*** ;;;### (autoloads (org-export-as-taskjuggler-and-open org-export-as-taskjuggler) -;;;;;; "org-taskjuggler" "org/org-taskjuggler.el" (20018 35031)) +;;;;;; "org-taskjuggler" "org/org-taskjuggler.el" (20045 30718)) ;;; Generated autoloads from org/org-taskjuggler.el (autoload 'org-export-as-taskjuggler "org-taskjuggler" "\ @@ -20977,7 +20977,7 @@ ;;;### (autoloads (org-timer-set-timer org-timer-item org-timer-change-times-in-region ;;;;;; org-timer org-timer-start) "org-timer" "org/org-timer.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30718)) ;;; Generated autoloads from org/org-timer.el (autoload 'org-timer-start "org-timer" "\ @@ -21038,7 +21038,7 @@ ;;;*** ;;;### (autoloads (org-export-as-xoxo) "org-xoxo" "org/org-xoxo.el" -;;;;;; (20018 35031)) +;;;;;; (20045 30719)) ;;; Generated autoloads from org/org-xoxo.el (autoload 'org-export-as-xoxo "org-xoxo" "\ @@ -21111,7 +21111,7 @@ ;;;### (autoloads (list-packages describe-package package-initialize ;;;;;; package-install-file package-install-from-buffer package-install ;;;;;; package-enable-at-startup) "package" "emacs-lisp/package.el" -;;;;;; (19893 19022)) +;;;;;; (20059 26455)) ;;; Generated autoloads from emacs-lisp/package.el (defvar package-enable-at-startup t "\ @@ -21127,8 +21127,8 @@ (autoload 'package-install "package" "\ Install the package named NAME. -Interactively, prompt for the package name. -The package is found on one of the archives in `package-archives'. +NAME should be the name of one of the available packages in an +archive in `package-archives'. Interactively, prompt for NAME. \(fn NAME)" t nil) @@ -21477,8 +21477,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" (19964 -;;;;;; 31562)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20051 +;;;;;; 32345)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -21612,7 +21612,7 @@ ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (19845 45374)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20062 2656)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m))) @@ -21801,7 +21801,7 @@ ;;;*** -;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (19988 13913)) +;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (20048 56149)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -22469,7 +22469,7 @@ ;;;*** -;;;### (autoloads (proced) "proced" "proced.el" (20006 43871)) +;;;### (autoloads (proced) "proced" "proced.el" (20053 39261)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -23122,8 +23122,8 @@ ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (19845 -;;;;;; 45374)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20054 +;;;;;; 8529)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -23138,7 +23138,7 @@ in your ~/.emacs (after loading/requiring quickurl).") (autoload 'quickurl "quickurl" "\ -Insert an URL based on LOOKUP. +Insert a URL based on LOOKUP. If not supplied LOOKUP is taken to be the word at point in the current buffer, this default action can be modifed via @@ -23147,14 +23147,14 @@ \(fn &optional LOOKUP)" t nil) (autoload 'quickurl-ask "quickurl" "\ -Insert an URL, with `completing-read' prompt, based on LOOKUP. +Insert a URL, with `completing-read' prompt, based on LOOKUP. \(fn LOOKUP)" t nil) (autoload 'quickurl-add-url "quickurl" "\ Allow the user to interactively add a new URL associated with WORD. -See `quickurl-grab-url' for details on how the default word/url combination +See `quickurl-grab-url' for details on how the default word/URL combination is decided. \(fn WORD URL COMMENT)" t nil) @@ -23195,7 +23195,7 @@ ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (20015 58840)) +;;;;;; "net/rcirc.el" (20058 5591)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -23839,7 +23839,7 @@ ;;;;;; 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" "mail/rmail.el" (19990 55648)) +;;;;;; "rmail" "mail/rmail.el" (20063 23511)) ;;; Generated autoloads from mail/rmail.el (autoload 'rmail-movemail-variant-p "rmail" "\ @@ -24659,7 +24659,7 @@ ;;;*** ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el" -;;;;;; (19845 45374)) +;;;;;; (20050 11479)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -24812,7 +24812,7 @@ ;;;;;; mail-default-reply-to mail-archive-file-name mail-header-separator ;;;;;; sendmail-query-once send-mail-function mail-interactive mail-self-blind ;;;;;; mail-specify-envelope-from mail-from-style) "sendmail" "mail/sendmail.el" -;;;;;; (19996 8027)) +;;;;;; (20025 8284)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -25095,8 +25095,8 @@ ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-force-delete server-start) "server" "server.el" (19986 -;;;;;; 58615)) +;;;;;; server-force-delete server-start) "server" "server.el" (20059 +;;;;;; 26455)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -25244,7 +25244,7 @@ ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (19890 42850)) +;;;;;; (20051 32345)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -25399,7 +25399,7 @@ ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (19964 31562)) +;;;;;; (20058 5591)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -25699,7 +25699,7 @@ ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" -;;;;;; "mail/smtpmail.el" (20002 46800)) +;;;;;; "mail/smtpmail.el" (20053 39293)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -26618,7 +26618,7 @@ ;;;*** ;;;### (autoloads (starttls-open-stream) "starttls" "gnus/starttls.el" -;;;;;; (19845 45374)) +;;;;;; (20047 35303)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -27509,7 +27509,7 @@ ;;;*** ;;;### (autoloads (tabulated-list-mode) "tabulated-list" "emacs-lisp/tabulated-list.el" -;;;;;; (19885 24894)) +;;;;;; (20045 30688)) ;;; Generated autoloads from emacs-lisp/tabulated-list.el (autoload 'tabulated-list-mode "tabulated-list" "\ @@ -27666,7 +27666,7 @@ ;;;*** ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el" -;;;;;; (19931 11784)) +;;;;;; (20050 11479)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -28445,7 +28445,7 @@ ;;;### (autoloads (emacs-init-time emacs-uptime display-time-world ;;;;;; display-time-mode display-time display-time-day-and-date) -;;;;;; "time" "time.el" (19999 41597)) +;;;;;; "time" "time.el" (20033 22846)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -28624,7 +28624,7 @@ ;;;*** ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp" -;;;;;; "time-stamp.el" (19886 45771)) +;;;;;; "time-stamp.el" (20033 22846)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -29074,7 +29074,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" (20010 40918)) +;;;;;; "net/tramp.el" (20062 2656)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -29126,24 +29126,19 @@ Also see `tramp-file-name-structure'.") -(defconst tramp-root-regexp (if (memq system-type '(cygwin windows-nt)) "\\`\\([a-zA-Z]:\\)?/" "\\`/") "\ -Beginning of an incomplete Tramp file name. -Usually, it is just \"\\\\`/\". On W32 systems, there might be a -volume letter, which will be removed by `tramp-drop-volume-letter'.") - -(defconst tramp-completion-file-name-regexp-unified (if (memq system-type '(cygwin windows-nt)) (concat tramp-root-regexp "[^/]\\{2,\\}\\'") (concat tramp-root-regexp "[^/]*\\'")) "\ +(defconst tramp-completion-file-name-regexp-unified (if (memq system-type '(cygwin windows-nt)) "\\`/[^/]\\{2,\\}\\'" "\\`/[^/]*\\'") "\ Value for `tramp-completion-file-name-regexp' for unified remoting. GNU Emacs uses a unified filename syntax for Tramp and Ange-FTP. See `tramp-file-name-structure' for more explanations. On W32 systems, the volume letter must be ignored.") -(defconst tramp-completion-file-name-regexp-separate (concat tramp-root-regexp "\\([[][^]]*\\)?\\'") "\ +(defconst tramp-completion-file-name-regexp-separate "\\`/\\([[][^]]*\\)?\\'" "\ Value for `tramp-completion-file-name-regexp' for separate remoting. XEmacs uses a separate filename syntax for Tramp and EFS. See `tramp-file-name-structure' for more explanations.") -(defconst tramp-completion-file-name-regexp-url (concat tramp-root-regexp "[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'") "\ +(defconst tramp-completion-file-name-regexp-url "\\`/[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'" "\ Value for `tramp-completion-file-name-regexp' for URL-like remoting. See `tramp-file-name-structure' for more explanations.") @@ -29222,8 +29217,8 @@ ;;;*** -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20048 +;;;;;; 56149)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -29510,7 +29505,7 @@ ;;;;;; ucs-normalize-NFKC-string ucs-normalize-NFKC-region ucs-normalize-NFKD-string ;;;;;; ucs-normalize-NFKD-region ucs-normalize-NFC-string ucs-normalize-NFC-region ;;;;;; ucs-normalize-NFD-string ucs-normalize-NFD-region) "ucs-normalize" -;;;;;; "international/ucs-normalize.el" (19845 45374)) +;;;;;; "international/ucs-normalize.el" (20052 53218)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -29845,7 +29840,7 @@ ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (19997 54906)) +;;;;;; url-http) "url-http" "url/url-http.el" (20031 47065)) ;;; Generated autoloads from url/url-http.el (autoload 'url-http "url-http" "\ @@ -30727,7 +30722,7 @@ ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (19845 45374)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20063 23511)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -31648,7 +31643,7 @@ ;;;;;; view-mode view-buffer-other-frame view-buffer-other-window ;;;;;; view-buffer view-file-other-frame view-file-other-window ;;;;;; view-file kill-buffer-if-not-modified view-remove-frame-by-deleting) -;;;;;; "view" "view.el" (20006 43871)) +;;;;;; "view" "view.el" (20053 39261)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -32845,8 +32840,8 @@ ;;;*** -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19886 -;;;;;; 45771)) +;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (20034 +;;;;;; 23247)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -33129,8 +33124,8 @@ ;;;;;; "vc/ediff-init.el" "vc/ediff-merg.el" "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") (20022 -;;;;;; 32281 188358)) +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (20063 +;;;;;; 23539 958052)) ;;;***