Mercurial > emacs

diff lisp/subr.el @ 83144:2e868590c17b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-357 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-358 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-359 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-360 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362 Support " [...]" style defaults in minibuffer-electric-default-mode * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363 (read-number): Use canonical format for default in prompt. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-365 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-184
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 03 Jun 2004 16:45:20 +0000
parents 9fb10038ca55 3c32f5d8430f
children 8e09aff3715a
line wrap: on
line diff
--- a/lisp/subr.el	Mon May 31 13:48:26 2004 +0000
+++ b/lisp/subr.el	Thu Jun 03 16:45:20 2004 +0000
@@ -851,9 +851,11 @@
 (make-obsolete 'dot-min 'point-min	"before 19.15")
 (make-obsolete 'dot-marker 'point-marker "before 19.15")
 (make-obsolete 'buffer-flush-undo 'buffer-disable-undo "before 19.15")
-(make-obsolete 'baud-rate "use the baud-rate variable instead." "before 19.15")
+(make-obsolete 'baud-rate "use the `baud-rate' variable instead." "before 19.15")
 (make-obsolete 'compiled-function-p 'byte-code-function-p "before 19.15")
 (make-obsolete 'define-function 'defalias "20.1")
+(make-obsolete 'focus-frame "it does nothing." "19.32")
+(make-obsolete 'unfocus-frame "it does nothing." "19.32")
 
 (defun insert-string (&rest args)
   "Mocklisp-compatibility insert function.
@@ -870,8 +872,8 @@
   "Return the value of the `baud-rate' variable."
   baud-rate)
 
-(defalias 'focus-frame 'ignore)
-(defalias 'unfocus-frame 'ignore)
+(defalias 'focus-frame 'ignore "")
+(defalias 'unfocus-frame 'ignore "")
 
 
 ;;;; Obsolescence declarations for variables.
@@ -1186,7 +1188,7 @@
 ;; compatibility
 
 (make-obsolete 'process-kill-without-query
-               "use `process-query-on-exit-flag'\nor `set-process-query-on-exit-flag'."
+               "use `process-query-on-exit-flag' or `set-process-query-on-exit-flag'."
                "21.5")
 (defun process-kill-without-query (process &optional flag)
   "Say no query needed if PROCESS is running when Emacs is exited.
@@ -1333,9 +1335,11 @@
   (let ((n nil))
     (when default
       (setq prompt
-	    (if (string-match "\\(\\):[^:]*" prompt)
-		(replace-match (format " [%s]" default) t t prompt 1)
-	      (concat prompt (format " [%s] " default)))))
+	    (if (string-match "\\(\\):[ \t]*\\'" prompt)
+		(replace-match (format " (default %s)" default) t t prompt 1)
+	      (replace-regexp-in-string "[ \t]*\\'"
+					(format " (default %s) " default)
+					prompt t t)))) 
     (while
 	(progn
 	  (let ((str (read-from-minibuffer prompt nil nil nil nil