Mercurial > emacs
comparison lisp/simple.el @ 83116:6ae3d2810507
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-262
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264
Update from CVS: lispref/display.texi: emacs -> Emacs.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-266
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-267
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-156
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 01 May 2004 19:23:22 +0000 |
parents | 1a68e4b22355 49e42dd581dd |
children | 46882e012e30 |
comparison
equal
deleted
inserted
replaced
83115:141388e31bb7 | 83116:6ae3d2810507 |
---|---|
2146 (opoint (point)) | 2146 (opoint (point)) |
2147 ;; Inhibit quitting so we can make a quit here | 2147 ;; Inhibit quitting so we can make a quit here |
2148 ;; look like a C-g typed as a command. | 2148 ;; look like a C-g typed as a command. |
2149 (inhibit-quit t)) | 2149 (inhibit-quit t)) |
2150 (if (pos-visible-in-window-p other-end (selected-window)) | 2150 (if (pos-visible-in-window-p other-end (selected-window)) |
2151 (unless transient-mark-mode | 2151 (unless (and transient-mark-mode |
2152 (face-background 'region)) | |
2152 ;; Swap point and mark. | 2153 ;; Swap point and mark. |
2153 (set-marker (mark-marker) (point) (current-buffer)) | 2154 (set-marker (mark-marker) (point) (current-buffer)) |
2154 (goto-char other-end) | 2155 (goto-char other-end) |
2155 (sit-for blink-matching-delay) | 2156 (sit-for blink-matching-delay) |
2156 ;; Swap back. | 2157 ;; Swap back. |