emacs: lisp/simple.el comparison

comparison lisp/simple.el @ 90066:fb79180b618d

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-78 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-719 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-732 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-733 Update from CVS: man/calc.texi: Fix some TeX definitions. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-734 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-75 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-76 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-77 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Tue, 14 Dec 2004 07:34:55 +0000
parents	f2ebccfa87d4 c7ebd794182b
children	eac554634bfa

comparison

equal deleted inserted replaced

-:c26eb15cd14a
+:fb79180b618d
 to indicate to `next-error' that this is a candidate buffer and how
 to navigate in it.")
 (make-variable-buffer-local 'next-error-function)
 (defsubst next-error-buffer-p (buffer
 			       &optional
 			       extra-test-inclusive
 			       extra-test-exclusive)
 "Test if BUFFER is a next-error capable buffer.
 EXTRA-TEST-INCLUSIVE is called to allow extra buffers.
-EXTRA-TEST-INCLUSIVE is called to disallow buffers."
+EXTRA-TEST-EXCLUSIVE is called to disallow buffers."
 (with-current-buffer buffer
 (or (and extra-test-inclusive (funcall extra-test-inclusive))
 	(and (if extra-test-exclusive (funcall extra-test-exclusive) t)
 	 next-error-function))))
 (defun next-error-find-buffer (&optional other-buffer
 					 extra-test-inclusive
 					 extra-test-exclusive)
 "Return a next-error capable buffer.
 OTHER-BUFFER will disallow the current buffer.
 EXTRA-TEST-INCLUSIVE is called to allow extra buffers.
-EXTRA-TEST-INCLUSIVE is called to disallow buffers."
+EXTRA-TEST-EXCLUSIVE is called to disallow buffers."
 (or
 ;; 1. If one window on the selected frame displays such buffer, return it.
 (let ((window-buffers
 (delete-dups
 (delq nil (mapcar (lambda (w)
 (if (next-error-buffer-p
 (window-buffer w)
-				    extra-test-inclusive extra-test-exclusive)
+extra-test-inclusive extra-test-exclusive)
 (window-buffer w)))
 (window-list))))))
 (if other-buffer
 (setq window-buffers (delq (current-buffer) window-buffers)))
 (if (eq (length window-buffers) 1)
 (car window-buffers)))
 ;; 2. If next-error-last-buffer is set to a live buffer, use that.
 (if (and next-error-last-buffer
 (buffer-name next-error-last-buffer)
 (next-error-buffer-p next-error-last-buffer
-				 extra-test-inclusive extra-test-exclusive)
+extra-test-inclusive extra-test-exclusive)
 (or (not other-buffer)
 (not (eq next-error-last-buffer (current-buffer)))))
 next-error-last-buffer)
 ;; 3. If the current buffer is a next-error capable buffer, return it.
 (if (and (not other-buffer)
 (next-error-buffer-p (current-buffer)
-				 extra-test-inclusive extra-test-exclusive))
+extra-test-inclusive extra-test-exclusive))
 (current-buffer))
 ;; 4. Look for a next-error capable buffer in a buffer list.
 (let ((buffers (buffer-list)))
 (while (and buffers
 (or (not (next-error-buffer-p
-			   (car buffers)
+(car buffers)
-			   extra-test-inclusive extra-test-exclusive))
+extra-test-inclusive extra-test-exclusive))
 (and other-buffer (eq (car buffers) (current-buffer)))))
 (setq buffers (cdr buffers)))
 (if buffers
 (car buffers)
 (or (and other-buffer
 (next-error-buffer-p (current-buffer)
-				     extra-test-inclusive extra-test-exclusive)
+extra-test-inclusive extra-test-exclusive)
 ;; The current buffer is a next-error capable buffer.
 (progn
 (if other-buffer
 (message "This is the only next-error capable buffer"))
 (current-buffer)))
 (progn
 (skip-chars-forward " \t")
 (constrain-to-field nil orig-pos t)))))
 (defvar inhibit-mark-movement nil
-"If non-nil, \\[beginning-of-buffer] and \\[end-of-buffer] does not set the mark.")
+"If non-nil, movement commands, such as \\[beginning-of-buffer], \
+do not set the mark.")
 (defun beginning-of-buffer (&optional arg)
 "Move point to the beginning of the buffer; leave mark at previous position.
 With \\[universal-argument] prefix, do not set mark at previous position.
 With numeric arg N, put point N/10 of the way from the beginning.
 of the accessible part of the buffer.
 Don't use this command in Lisp programs!
 \(goto-char (point-min)) is faster and avoids clobbering the mark."
 (interactive "P")
-(unless (or inhibit-mark-movement (consp arg))
+(or inhibit-mark-movement
-(push-mark))
+(consp arg)
+(and transient-mark-mode mark-active)
+(push-mark))
 (let ((size (- (point-max) (point-min))))
 (goto-char (if (and arg (not (consp arg)))
 		   (+ (point-min)
 		      (if (> size 10000)
 			  ;; Avoid overflow for large buffer sizes!
 of the accessible part of the buffer.
 Don't use this command in Lisp programs!
 \(goto-char (point-max)) is faster and avoids clobbering the mark."
 (interactive "P")
-(unless (or inhibit-mark-movement (consp arg))
+(or inhibit-mark-movement
-(push-mark))
+(consp arg)
+(and transient-mark-mode mark-active)
+(push-mark))
 (let ((size (- (point-max) (point-min))))
 (goto-char (if (and arg (not (consp arg)))
 		   (- (point-max)
 		      (if (> size 10000)
 			  ;; Avoid overflow for large buffer sizes!
 \\[keyboard-escape-quit].
 Many commands change their behavior when Transient Mark mode is in effect
 and the mark is active, by acting on the region instead of their usual
 default part of the buffer's text.  Examples of such commands include
-\\[comment-dwim], \\[flush-lines], \\[ispell], \\[keep-lines],
+\\[comment-dwim], \\[flush-lines], \\[keep-lines], \
-\\[query-replace], \\[query-replace-regexp], and \\[undo].  Invoke
+\\[query-replace], \\[query-replace-regexp], \\[ispell], and \\[undo].
-\\[apropos-documentation] and type \"transient\" or \"mark.*active\" at
+Invoke \\[apropos-documentation] and type \"transient\" or
-the prompt, to see the documentation of commands which are sensitive to
+\"mark.*active\" at the prompt, to see the documentation of
-the Transient Mark mode."
+commands which are sensitive to the Transient Mark mode."
 :global t :group 'editing-basics :require nil)
 (defun pop-global-mark ()
 "Pop off global mark ring and jump to the top location."
 (interactive)
 	    ;; See if it is ok.
 	    (backward-char)
 	    (if (if forward
 		    ;; If going forward, don't accept the previous
 		    ;; allowable position if it is before the target line.
 		    (< line-beg (point))
 		  ;; If going backward, don't accept the previous
 		  ;; allowable position if it is still after the target line.
 		  (<= (point) line-end))
 		(setq new (point))
 	      ;; As a last resort, use the end of the line.
 "Move backward until encountering the beginning of a word.
 With argument, do this that many times."
 (interactive "p")
 (forward-word (- (or arg 1))))
-(defun mark-word (arg)
+(defun mark-word (&optional arg)
-"Set mark arg words away from point.
+"Set mark ARG words away from point.
-If this command is repeated, it marks the next ARG words after the ones
+The place mark goes is the same place \\[forward-word] would
-already marked."
+move to with the same argument.
-(interactive "p")
+If this command is repeated or mark is active in Transient Mark mode,
-(cond ((and (eq last-command this-command) (mark t))
+it marks the next ARG words after the ones already marked."
+(interactive "P")
+(cond ((or (and (eq last-command this-command) (mark t))
+	     (and transient-mark-mode mark-active))
+	 (setq arg (if arg (prefix-numeric-value arg)
+		     (if (< (mark) (point)) -1 1)))
 	 (set-mark
 	  (save-excursion
 	    (goto-char (mark))
 	    (forward-word arg)
 	    (point))))
 	(t
 	 (push-mark
 	  (save-excursion
-	    (forward-word arg)
+	    (forward-word (prefix-numeric-value arg))
 	    (point))
 	  nil t))))
 (defun kill-word (arg)
 "Kill characters forward until encountering the end of a word.
 (cond ((eq last-command 'mode-exited) nil)
 	((> (minibuffer-depth) 0)
 	 (abort-recursive-edit))
 	(current-prefix-arg
 	 nil)
-	((and transient-mark-mode
+	((and transient-mark-mode mark-active)
-	      mark-active)
 	 (deactivate-mark))
 	((> (recursion-depth) 0)
 	 (exit-recursive-edit))
 	(buffer-quit-function
 	 (funcall buffer-quit-function))

Mercurial > emacs

comparison lisp/simple.el @ 90066:fb79180b618d