[Emacs-diffs] Changes to emacs/lisp/subr.el [lexbind]

[Miles Bader]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.307.2.14 emacs/lisp/subr.el:1.307.2.15
*** emacs/lisp/subr.el:1.307.2.14       Tue Jul  6 09:31:50 2004
--- emacs/lisp/subr.el  Tue Jul  6 09:39:53 2004
***************
*** 857,865 ****
  (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 'compiled-function-p 'byte-code-function-p "before 19.15")
  (make-obsolete 'define-function 'defalias "20.1")
  
  (defun insert-string (&rest args)
    "Mocklisp-compatibility insert function.
--- 857,867 ----
  (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 '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.
***************
*** 876,883 ****
    "Return the value of the `baud-rate' variable."
    baud-rate)
  
! (defalias 'focus-frame 'ignore)
! (defalias 'unfocus-frame 'ignore)
  
  
  ;;;; Obsolescence declarations for variables.
--- 878,885 ----
    "Return the value of the `baud-rate' variable."
    baud-rate)
  
! (defalias 'focus-frame 'ignore "")
! (defalias 'unfocus-frame 'ignore "")
  
  
  ;;;; Obsolescence declarations for variables.
***************
*** 1192,1198 ****
  ;; compatibility
  
  (make-obsolete 'process-kill-without-query
!                "use `process-query-on-exit-flag'\nor 
`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.
--- 1194,1200 ----
  ;; compatibility
  
  (make-obsolete 'process-kill-without-query
!                "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.
***************
*** 1339,1347 ****
    (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)))))
      (while
        (progn
          (let ((str (read-from-minibuffer prompt nil nil nil nil
--- 1341,1351 ----
    (let ((n nil))
      (when default
        (setq prompt
!           (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