Mercurial > emacs
changeset 50136:ad28e7a35442
* files.el (recover-session): Error if there are no previous
sessions to recover.
* subr.el (posn-col-row): Simplify.
* arc-mode.el (archive-subtype, archive-file-list-start)
(archive-file-list-end, archive-proper-file-start)
(archive-read-only, archive-local-name, archive-mode-map)
(archive-file-name-indent, archive-remote)
(archive-alternate-display, archive-superior-buffer)
(archive-subfile-mode): Doc fixes.
| author | John Paul Wallington <jpw@pobox.com> |
|---|---|
| date | Fri, 14 Mar 2003 22:36:57 +0000 |
| parents | 167c56f6d789 |
| children | b9209df48d29 |
| files | lisp/arc-mode.el lisp/files.el lisp/subr.el |
| diffstat | 3 files changed, 23 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/arc-mode.el Fri Mar 14 22:29:13 2003 +0000 +++ b/lisp/arc-mode.el Fri Mar 14 22:36:57 2003 +0000 @@ -324,16 +324,16 @@ ;; ------------------------------------------------------------------------- ;; Section: Variables -(defvar archive-subtype nil "*Symbol describing archive type.") -(defvar archive-file-list-start nil "*Position of first contents line.") -(defvar archive-file-list-end nil "*Position just after last contents line.") -(defvar archive-proper-file-start nil "*Position of real archive's start.") -(defvar archive-read-only nil "*Non-nil if the archive is read-only on disk.") -(defvar archive-local-name nil "*Name of local copy of remote archive.") -(defvar archive-mode-map nil "*Local keymap for archive mode listings.") -(defvar archive-file-name-indent nil "*Column where file names start.") +(defvar archive-subtype nil "Symbol describing archive type.") +(defvar archive-file-list-start nil "Position of first contents line.") +(defvar archive-file-list-end nil "Position just after last contents line.") +(defvar archive-proper-file-start nil "Position of real archive's start.") +(defvar archive-read-only nil "Non-nil if the archive is read-only on disk.") +(defvar archive-local-name nil "Name of local copy of remote archive.") +(defvar archive-mode-map nil "Local keymap for archive mode listings.") +(defvar archive-file-name-indent nil "Column where file names start.") -(defvar archive-remote nil "*Non-nil if the archive is outside file system.") +(defvar archive-remote nil "Non-nil if the archive is outside file system.") (make-variable-buffer-local 'archive-remote) (put 'archive-remote 'permanent-local t) @@ -341,14 +341,14 @@ (make-variable-buffer-local 'archive-member-coding-system) (defvar archive-alternate-display nil - "*Non-nil when alternate information is shown.") + "Non-nil when alternate information is shown.") (make-variable-buffer-local 'archive-alternate-display) (put 'archive-alternate-display 'permanent-local t) -(defvar archive-superior-buffer nil "*In archive members, points to archive.") +(defvar archive-superior-buffer nil "In archive members, points to archive.") (put 'archive-superior-buffer 'permanent-local t) -(defvar archive-subfile-mode nil "*Non-nil in archive member buffers.") +(defvar archive-subfile-mode nil "Non-nil in archive member buffers.") (make-variable-buffer-local 'archive-subfile-mode) (put 'archive-subfile-mode 'permanent-local t)
--- a/lisp/files.el Fri Mar 14 22:29:13 2003 +0000 +++ b/lisp/files.el Fri Mar 14 22:36:57 2003 +0000 @@ -3467,7 +3467,13 @@ (error "You set `auto-save-list-file-prefix' to disable making session files")) (let ((dir (file-name-directory auto-save-list-file-prefix))) (unless (file-directory-p dir) - (make-directory dir t))) + (make-directory dir t)) + (unless (directory-files dir nil + (concat "\\`" (regexp-quote + (file-name-nondirectory + auto-save-list-file-prefix))) + t) + (error "No previous sessions to recover"))) (let ((ls-lisp-support-shell-wildcards t)) (dired (concat auto-save-list-file-prefix "*") (concat dired-listing-switches "t")))
--- a/lisp/subr.el Fri Mar 14 22:29:13 2003 +0000 +++ b/lisp/subr.el Fri Mar 14 22:36:57 2003 +0000 @@ -656,9 +656,7 @@ For a scroll-bar event, the result column is 0, and the row corresponds to the vertical position of the click in the scroll bar." (let* ((pair (nth 2 position)) - (window (posn-window position)) - (vspacing (or (frame-parameter (window-frame window) 'line-spacing) - default-line-spacing))) + (window (posn-window position))) (if (eq (if (consp (nth 1 position)) (car (nth 1 position)) (nth 1 position)) @@ -672,7 +670,9 @@ (let* ((frame (if (framep window) window (window-frame window))) (x (/ (car pair) (frame-char-width frame))) (y (/ (cdr pair) (+ (frame-char-height frame) - (or vspacing 0))))) + (or (frame-parameter frame 'line-spacing) + default-line-spacing + 0))))) (cons x y)))))) (defsubst posn-timestamp (position)