Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/lisp/simple.el Thu Apr 29 20:45:02 2004 +0000 +++ b/lisp/simple.el Sat May 01 19:23:22 2004 +0000 @@ -2148,7 +2148,8 @@ ;; look like a C-g typed as a command. (inhibit-quit t)) (if (pos-visible-in-window-p other-end (selected-window)) - (unless transient-mark-mode + (unless (and transient-mark-mode + (face-background 'region)) ;; Swap point and mark. (set-marker (mark-marker) (point) (current-buffer)) (goto-char other-end)