masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-18 18:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in changes from CVS trunk.

Browse source 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-726
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-727
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-728
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-729
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-730
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-731
   Update from CVS

 * 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/emacs--cvs-trunk--0--patch-735
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-736
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-737
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-738
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-739
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-740
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-741
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-742
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-743
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-744
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-745
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-746
   Update from CVS

 * 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
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-77
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-277
This commit is contained in:
Karoly Lorentey 2004-12-23 16:43:51 +00:00
commit 17d51b68fb
114 changed files with 3998 additions and 2294 deletions
Download patch file Download diff file Expand all files Collapse all files

94
lisp/simple.el
View file

@ -123,33 +123,33 @@ to navigate in it.")
(make-variable-buffer-local 'next-error-function)
(defsubst next-error-buffer-p (buffer
&optional
extra-test-inclusive
(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
(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)
(window-buffer w)
extra-test-inclusive extra-test-exclusive)
(window-buffer w)))
(window-list))))))
(if other-buffer
@ -159,29 +159,29 @@ EXTRA-TEST-INCLUSIVE is called to disallow 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)
(next-error-buffer-p next-error-last-buffer
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))
(next-error-buffer-p (current-buffer)
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)
extra-test-inclusive extra-test-exclusive))
(or (not (next-error-buffer-p
(car buffers)
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)
(next-error-buffer-p (current-buffer)
extra-test-inclusive extra-test-exclusive)
;; The current buffer is a next-error capable buffer.
(progn
(if other-buffer
@ -645,9 +645,6 @@ If BACKWARD-ONLY is non-nil, only delete spaces before point."
(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.")
(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.
@ -659,8 +656,9 @@ 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))
(push-mark))
(or (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)
@ -683,8 +681,9 @@ 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))
(push-mark))
(or (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)
@ -1485,6 +1484,17 @@ is not *inside* the region START...END."
(t
'(0 . 0)))
'(0 . 0)))
;; When the first undo batch in an undo list is longer than undo-outer-limit,
;; this function gets called to ask the user what to do.
;; Garbage collection is inhibited around the call,
;; so it had better not do a lot of consing.
(setq undo-outer-limit-function 'undo-outer-limit-truncate)
(defun undo-outer-limit-truncate (size)
(if (yes-or-no-p (format "Buffer %s undo info is %d bytes long; discard it? "
(buffer-name) size))
(progn (setq buffer-undo-list nil) t)
nil))
(defvar shell-command-history nil
"History list for some commands that read shell commands.")
@ -2991,11 +3001,11 @@ You can also deactivate the mark by typing \\[keyboard-quit] or
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],
\\[query-replace], \\[query-replace-regexp], and \\[undo]. Invoke
\\[apropos-documentation] and type \"transient\" or \"mark.*active\" at
the prompt, to see the documentation of commands which are sensitive to
the Transient Mark mode."
\\[comment-dwim], \\[flush-lines], \\[keep-lines], \
\\[query-replace], \\[query-replace-regexp], \\[ispell], and \\[undo].
Invoke \\[apropos-documentation] and type \"transient\" or
\"mark.*active\" at the prompt, to see the documentation of
commands which are sensitive to the Transient Mark mode."
:global t :group 'editing-basics :require nil)
(defun pop-global-mark ()
@ -3246,7 +3256,7 @@ Outline mode sets this."
(if (if forward
;; If going forward, don't accept the previous
;; allowable position if it is before the target line.
(< line-beg (point))
(< line-beg (point))
;; If going backward, don't accept the previous
;; allowable position if it is still after the target line.
(<= (point) line-end))
@ -3527,12 +3537,17 @@ With argument, do this that many times."
(interactive "p")
(forward-word (- (or arg 1))))
(defun mark-word (arg)
"Set mark arg words away from point.
If this command is repeated, it marks the next ARG words after the ones
already marked."
(interactive "p")
(cond ((and (eq last-command this-command) (mark t))
(defun mark-word (&optional arg)
"Set mark ARG words away from point.
The place mark goes is the same place \\[forward-word] would
move to with the same argument.
If this command is repeated or mark is active in Transient Mark mode,
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))
@ -3541,7 +3556,7 @@ already marked."
(t
(push-mark
(save-excursion
(forward-word arg)
(forward-word (prefix-numeric-value arg))
(point))
nil t))))
@ -4025,8 +4040,7 @@ or go back to just one window (by deleting all but the selected window)."
(abort-recursive-edit))
(current-prefix-arg
nil)
((and transient-mark-mode
mark-active)
((and transient-mark-mode mark-active)
(deactivate-mark))
((> (recursion-depth) 0)
(exit-recursive-edit))