-;;; register.el --- register commands for Emacs.
+;;; register.el --- register commands for Emacs
;; Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc.
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
(defvar register-alist nil
"Alist of elements (NAME . CONTENTS), one for each Emacs register.
-NAME is a character (a number). CONTENTS is a string, number,
-frame configuration, mark or list.
+NAME is a character (a number). CONTENTS is a string, number, marker or list.
A list of strings represents a rectangle.
-A list of the form (file . NAME) represents the file named NAME.")
+A list of the form (file . NAME) represents the file named NAME.
+A list of the form (file-query NAME POSITION) represents position POSITION
+ in the file named NAME, but query before visiting it.
+A list of the form (WINDOW-CONFIGURATION POSITION)
+ represents a saved window configuration plus a saved value of point.
+A list of the form (FRAME-CONFIGURATION POSITION)
+ represents a saved frame configuration plus a saved value of point.")
(defun get-register (reg)
"Return contents of Emacs register named REG, or nil if none."
Argument is a character, naming the register."
(interactive "cPoint to register: \nP")
(set-register register
- (if arg (current-frame-configuration) (point-marker))))
+ (if arg (list (current-frame-configuration) (point-marker))
+ (point-marker))))
(defun window-configuration-to-register (register &optional arg)
"Store the window configuration of the selected frame in register REGISTER.
Use \\[jump-to-register] to restore the configuration.
Argument is a character, naming the register."
(interactive "cWindow configuration to register: \nP")
- (set-register register (current-window-configuration)))
+ ;; current-window-configuration does not include the value
+ ;; of point in the current buffer, so record that separately.
+ (set-register register (list (current-window-configuration) (point-marker))))
(defun frame-configuration-to-register (register &optional arg)
"Store the window configuration of all frames in register REGISTER.
Use \\[jump-to-register] to restore the configuration.
Argument is a character, naming the register."
(interactive "cFrame configuration to register: \nP")
- (set-register register (current-frame-configuration)))
+ ;; current-frame-configuration does not include the value
+ ;; of point in the current buffer, so record that separately.
+ (set-register register (list (current-frame-configuration) (point-marker))))
(defalias 'register-to-point 'jump-to-register)
(defun jump-to-register (register &optional delete)
(interactive "cJump to register: \nP")
(let ((val (get-register register)))
(cond
- ((and (fboundp 'frame-configuration-p)
- (frame-configuration-p val))
- (set-frame-configuration val (not delete)))
- ((window-configuration-p val)
- (set-window-configuration val))
+ ((and (consp val) (frame-configuration-p (car val)))
+ (set-frame-configuration (car val) (not delete))
+ (goto-char (cadr val)))
+ ((and (consp val) (window-configuration-p (car val)))
+ (set-window-configuration (car val))
+ (goto-char (cadr val)))
((markerp val)
(or (marker-buffer val)
(error "That register's buffer no longer exists"))
(goto-char val))
((and (consp val) (eq (car val) 'file))
(find-file (cdr val)))
+ ((and (consp val) (eq (car val) 'file-query))
+ (or (find-buffer-visiting (nth 1 val))
+ (y-or-n-p (format "Visit file %s again? " (nth 1 val)))
+ (error "Register access aborted"))
+ (find-file (nth 1 val))
+ (goto-char (nth 2 val)))
(t
(error "Register doesn't contain a buffer position or configuration")))))
-;(defun number-to-register (arg char)
-; "Store a number in a register.
-;Two args, NUMBER and REGISTER (a character, naming the register).
-;If NUMBER is nil, digits in the buffer following point are read
-;to get the number to store.
-;Interactively, NUMBER is the prefix arg (none means nil)."
-; (interactive "P\ncNumber to register: ")
-; (set-register char
-; (if arg
-; (prefix-numeric-value arg)
-; (if (looking-at "[0-9][0-9]*")
-; (save-excursion
-; (save-restriction
-; (narrow-to-region (point)
-; (progn (skip-chars-forward "0-9")
-; (point)))
-; (goto-char (point-min))
-; (read (current-buffer))))
-; 0))))
-
-;(defun increment-register (arg char)
-; "Add NUMBER to the contents of register REGISTER.
-;Interactively, NUMBER is the prefix arg (none means nil)."
-; (interactive "p\ncNumber to register: ")
-; (or (integerp (get-register char))
-; (error "Register does not contain a number"))
-; (set-register char (+ arg (get-register char))))
+;; Turn markers into file-query references when a buffer is killed.
+(defun register-swap-out ()
+ (and buffer-file-name
+ (let ((tail register-alist))
+ (while tail
+ (and (markerp (cdr (car tail)))
+ (eq (marker-buffer (cdr (car tail))) (current-buffer))
+ (setcdr (car tail)
+ (list 'file-query
+ buffer-file-name
+ (marker-position (cdr (car tail))))))
+ (setq tail (cdr tail))))))
+
+(add-hook 'kill-buffer-hook 'register-swap-out)
+
+(defun number-to-register (number register)
+ "Store a number in a register.
+Two args, NUMBER and REGISTER (a character, naming the register).
+If NUMBER is nil, a decimal number is read from the buffer starting
+at point, and point moves to the end of that number.
+Interactively, NUMBER is the prefix arg (none means nil)."
+ (interactive "P\ncNumber to register: ")
+ (set-register register
+ (if number
+ (prefix-numeric-value number)
+ (if (looking-at "\\s-*-?[0-9]+")
+ (progn
+ (goto-char (match-end 0))
+ (string-to-int (match-string 0)))
+ 0))))
+
+(defun increment-register (number register)
+ "Add NUMBER to the contents of register REGISTER.
+Interactively, NUMBER is the prefix arg."
+ (interactive "p\ncIncrement register: ")
+ (or (numberp (get-register register))
+ (error "Register does not contain a number"))
+ (set-register register (+ number (get-register register))))
(defun view-register (register)
"Display what is contained in register named REGISTER.
(princ (single-key-description register))
(princ " contains ")
(cond
- ((integerp val)
+ ((numberp val)
(princ val))
((markerp val)
(princ ", position ")
(princ (marker-position val)))))
- ((window-configuration-p val)
+ ((and (consp val) (window-configuration-p (car val)))
(princ "a window configuration."))
- ((frame-configuration-p val)
+ ((and (consp val) (frame-configuration-p (car val)))
(princ "a frame configuration."))
((and (consp val) (eq (car val) 'file))
(prin1 (cdr val))
(princ "."))
+ ((and (consp val) (eq (car val) 'file-query))
+ (princ "a file-query reference:\nfile ")
+ (prin1 (car (cdr val)))
+ (princ ",\nposition ")
+ (princ (car (cdr (cdr val))))
+ (princ "."))
+
((consp val)
(princ "the rectangle:\n")
(while val
(insert-rectangle val))
((stringp val)
(insert val))
- ((integerp val)
+ ((numberp val)
(princ val (current-buffer)))
((and (markerp val) (marker-position val))
(princ (marker-position val) (current-buffer)))
HCoop / bpt / emacs.git / blobdiff