comparison lisp/prim/minibuf.el @ 165:5a88923fcbfe r20-3b9

Import from CVS: tag r20-3b9
author cvs
date Mon, 13 Aug 2007 09:44:42 +0200
parents 0132846995bd
children 15872534500d
comparison
equal deleted inserted replaced
164:4e0740e5aab2 165:5a88923fcbfe
228 map 228 map
229 )) 229 ))
230 230
231 (defun minibuffer-keyboard-quit () 231 (defun minibuffer-keyboard-quit ()
232 "Abort recursive edit. 232 "Abort recursive edit.
233 If `zmacs-regions' is true, and the zmacs region is active, then this 233 If `zmacs-regions' is true, and the zmacs region is active in this buffer,
234 key deactivates the region without beeping." 234 then this key deactivates the region without beeping."
235 (interactive) 235 (interactive)
236 (if (and zmacs-regions (zmacs-deactivate-region)) 236 (if (and (region-active-p)
237 (eq (current-buffer) (zmacs-region-buffer)))
237 ;; pseudo-zmacs compatibility: don't beep if this ^G is simply 238 ;; pseudo-zmacs compatibility: don't beep if this ^G is simply
238 ;; deactivating the region. If it is inactive, beep. 239 ;; deactivating the region. If it is inactive, beep.
239 nil 240 nil
240 (abort-recursive-edit))) 241 (abort-recursive-edit)))
241 242