From 31e1d9206b69676f624dd8ef2958afbbe6e32fd5 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Fri, 23 Apr 1993 06:51:44 +0000 Subject: [PATCH] All fsets changed to defaliases. --- lisp/emacs-lisp/cust-print.el | 8 +-- lisp/emacs-lisp/lselect.el | 4 +- lisp/emacs-lisp/lucid.el | 102 +++++++++++++++++----------------- lisp/find-dired.el | 8 +-- lisp/frame.el | 8 +-- lisp/gnuspost.el | 4 +- lisp/mail/rmail.el | 4 +- lisp/mim-mode.el | 2 +- lisp/play/life.el | 2 +- lisp/register.el | 2 +- lisp/replace.el | 8 +-- lisp/select.el | 2 +- lisp/shell.el | 4 +- lisp/tar-mode.el | 4 +- lisp/textmodes/ispell4.el | 2 +- lisp/textmodes/picture.el | 2 +- lisp/textmodes/tex-mode.el | 8 +-- lisp/textmodes/two-column.el | 2 +- 18 files changed, 88 insertions(+), 88 deletions(-) diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el index a4fe14d50e..355b046b95 100644 --- a/lisp/emacs-lisp/cust-print.el +++ b/lisp/emacs-lisp/cust-print.el @@ -167,7 +167,7 @@ Any pair that has the same PREDICATE is first removed." ;; Saving and restoring internal printing routines. (defun cust-print-set-function-cell (symbol-pair) - (fset (car symbol-pair) + (defalias (car symbol-pair) (symbol-function (car (cdr symbol-pair))))) @@ -300,8 +300,8 @@ string argument will also work. The string is generated with (circle-level (or print-level -1)) ) - (fset 'cust-print-internal-printer internal-printer) - (fset 'cust-print-low-level-prin + (defalias 'cust-print-internal-printer internal-printer) + (defalias 'cust-print-low-level-prin (cond ((or custom-print-list custom-print-vector @@ -311,7 +311,7 @@ string argument will also work. The string is generated with (circle-table 'cust-print-object) (t 'cust-print-internal-printer))) - (fset 'cust-print-prin (if circle-table 'cust-print-circular 'cust-print-low-level-prin)) + (defalias 'cust-print-prin (if circle-table 'cust-print-circular 'cust-print-low-level-prin)) (cust-print-prin object) object)) diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el index df2b8d65d8..98e726bb0f 100644 --- a/lisp/emacs-lisp/lselect.el +++ b/lisp/emacs-lisp/lselect.el @@ -28,8 +28,8 @@ ;;; all upper-case; this may seem tasteless, but it makes there be a 1:1 ;;; correspondence between these symbols and X Atoms (which are upcased.) -(fset 'x-get-cutbuffer 'x-get-cut-buffer) -(fset 'x-store-cutbuffer 'x-set-cut-buffer) +(defalias 'x-get-cutbuffer 'x-get-cut-buffer) +(defalias 'x-store-cutbuffer 'x-set-cut-buffer) (or (find-face 'primary-selection) (make-face 'primary-selection)) diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el index 5ff77c5b01..2138c13bf6 100644 --- a/lisp/emacs-lisp/lucid.el +++ b/lisp/emacs-lisp/lucid.el @@ -37,7 +37,7 @@ new) tree))) -(fset 'current-time-seconds 'current-time) +(defalias 'current-time-seconds 'current-time) (defun keymap-parent (keymap) (let ((tail (cdr keymap))) @@ -119,58 +119,58 @@ bottom of the buffer stack." (if (<= arg 1) (other-buffer (current-buffer)) (nth (1+ arg) (buffer-list))))) -(fset 'find-face 'internal-find-face) -(fset 'get-face 'internal-get-face) -(fset 'try-face-font 'internal-try-face-font) +(defalias 'find-face 'internal-find-face) +(defalias 'get-face 'internal-get-face) +(defalias 'try-face-font 'internal-try-face-font) ;; Support the Lucid names with `screen' instead of `frame'. -(fset 'current-screen-configuration 'current-frame-configuration) -(fset 'delete-screen 'delete-frame) -(fset 'find-file-new-screen 'find-file-other-frame) -(fset 'find-file-read-only-new-screen 'find-file-read-only-other-frame) -(fset 'find-tag-new-screen 'find-tag-other-frame) -;;(fset 'focus-screen 'focus-frame) -(fset 'iconify-screen 'iconify-frame) -(fset 'mail-new-screen 'mail-other-frame) -(fset 'make-screen-invisible 'make-frame-invisible) -(fset 'make-screen-visible 'make-frame-visible) -;; (fset 'minibuffer-screen-list 'minibuffer-frame-list) -(fset 'modify-screen-parameters 'modify-frame-parameters) -(fset 'next-screen 'next-frame) -;; (fset 'next-multiscreen-window 'next-multiframe-window) -;; (fset 'previous-multiscreen-window 'previous-multiframe-window) -;; (fset 'redirect-screen-focus 'redirect-frame-focus) -(fset 'redraw-screen 'redraw-frame) -;; (fset 'screen-char-height 'frame-char-height) -;; (fset 'screen-char-width 'frame-char-width) -;; (fset 'screen-configuration-to-register 'frame-configuration-to-register) -;; (fset 'screen-focus 'frame-focus) -(fset 'screen-height 'frame-height) -(fset 'screen-list 'frame-list) -;; (fset 'screen-live-p 'frame-live-p) -(fset 'screen-parameters 'frame-parameters) -(fset 'screen-pixel-height 'frame-pixel-height) -(fset 'screen-pixel-width 'frame-pixel-width) -(fset 'screen-root-window 'frame-root-window) -(fset 'screen-selected-window 'frame-selected-window) -(fset 'lower-screen 'lower-frame) -(fset 'raise-screen 'raise-frame) -(fset 'screen-visible-p 'frame-visible-p) -(fset 'screen-width 'frame-width) -(fset 'screenp 'framep) -(fset 'select-screen 'select-frame) -(fset 'selected-screen 'selected-frame) -;; (fset 'set-screen-configuration 'set-frame-configuration) -;; (fset 'set-screen-height 'set-frame-height) -(fset 'set-screen-position 'set-frame-position) -(fset 'set-screen-size 'set-frame-size) -ll (fset 'set-screen-width 'set-frame-width) -(fset 'switch-to-buffer-new-screen 'switch-to-buffer-other-frame) -;; (fset 'unfocus-screen 'unfocus-frame) -(fset 'visible-screen-list 'visible-frame-list) -(fset 'window-screen 'window-frame) -(fset 'x-create-screen 'x-create-frame) -(fset 'x-new-screen 'new-frame) +(defalias 'current-screen-configuration 'current-frame-configuration) +(defalias 'delete-screen 'delete-frame) +(defalias 'find-file-new-screen 'find-file-other-frame) +(defalias 'find-file-read-only-new-screen 'find-file-read-only-other-frame) +(defalias 'find-tag-new-screen 'find-tag-other-frame) +;;(defalias 'focus-screen 'focus-frame) +(defalias 'iconify-screen 'iconify-frame) +(defalias 'mail-new-screen 'mail-other-frame) +(defalias 'make-screen-invisible 'make-frame-invisible) +(defalias 'make-screen-visible 'make-frame-visible) +;; (defalias 'minibuffer-screen-list 'minibuffer-frame-list) +(defalias 'modify-screen-parameters 'modify-frame-parameters) +(defalias 'next-screen 'next-frame) +;; (defalias 'next-multiscreen-window 'next-multiframe-window) +;; (defalias 'previous-multiscreen-window 'previous-multiframe-window) +;; (defalias 'redirect-screen-focus 'redirect-frame-focus) +(defalias 'redraw-screen 'redraw-frame) +;; (defalias 'screen-char-height 'frame-char-height) +;; (defalias 'screen-char-width 'frame-char-width) +;; (defalias 'screen-configuration-to-register 'frame-configuration-to-register) +;; (defalias 'screen-focus 'frame-focus) +(defalias 'screen-height 'frame-height) +(defalias 'screen-list 'frame-list) +;; (defalias 'screen-live-p 'frame-live-p) +(defalias 'screen-parameters 'frame-parameters) +(defalias 'screen-pixel-height 'frame-pixel-height) +(defalias 'screen-pixel-width 'frame-pixel-width) +(defalias 'screen-root-window 'frame-root-window) +(defalias 'screen-selected-window 'frame-selected-window) +(defalias 'lower-screen 'lower-frame) +(defalias 'raise-screen 'raise-frame) +(defalias 'screen-visible-p 'frame-visible-p) +(defalias 'screen-width 'frame-width) +(defalias 'screenp 'framep) +(defalias 'select-screen 'select-frame) +(defalias 'selected-screen 'selected-frame) +;; (defalias 'set-screen-configuration 'set-frame-configuration) +;; (defalias 'set-screen-height 'set-frame-height) +(defalias 'set-screen-position 'set-frame-position) +(defalias 'set-screen-size 'set-frame-size) +ll (defalias 'set-screen-width 'set-frame-width) +(defalias 'switch-to-buffer-new-screen 'switch-to-buffer-other-frame) +;; (defalias 'unfocus-screen 'unfocus-frame) +(defalias 'visible-screen-list 'visible-frame-list) +(defalias 'window-screen 'window-frame) +(defalias 'x-create-screen 'x-create-frame) +(defalias 'x-new-screen 'new-frame) ;;; end of lucid.el diff --git a/lisp/find-dired.el b/lisp/find-dired.el index 5fa664ed42..5524b2c230 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -7,8 +7,8 @@ ;; Maintainer: Sebastian Kremer ;; Keywords: unix -(defconst find-dired-version (substring "$Revision: 1.10 $" 11 -2) - "$Id: find-dired.el,v 1.10 1992/09/27 01:24:00 roland Exp eric $") +(defconst find-dired-version (substring "$Revision: 1.11 $" 11 -2) + "$Id: find-dired.el,v 1.11 1993/03/17 15:24:18 eric Exp eric $") ;;; This program is free software; you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ ;; find-dired|Roland McGrath, Sebastian Kremer ;; |roland@gnu.ai.mit.edu, sk@thp.uni-koeln.de ;; |Run a `find' command and dired the output -;; |$Date: 1992/09/27 01:24:00 $|$Revision: 1.10 $| +;; |$Date: 1993/03/17 15:24:18 $|$Revision: 1.11 $| ;; INSTALLATION ====================================================== @@ -148,7 +148,7 @@ The command run (after changing into DIR) is ;; Date: 10 May 91 17:50:00 GMT ;; Organization: University of Waterloo -(fset 'lookfor-dired 'find-grep-dired) +(defalias 'lookfor-dired 'find-grep-dired) ;;;###autoload (defun find-grep-dired (dir args) "Find files in DIR containing a regexp ARG and start Dired on output. diff --git a/lisp/frame.el b/lisp/frame.el index 2607d360ab..488fd682cc 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -237,7 +237,7 @@ These supercede the values given in `default-frame-alist'.") t))) ;; Alias, kept temporarily. -(fset 'new-frame 'make-frame) +(defalias 'new-frame 'make-frame) (defun make-frame (&optional parameters) "Create a new frame, displaying the current buffer. @@ -426,8 +426,8 @@ Horizontal scroll bars aren't implemented yet." ;;;; Aliases for backward compatibility with Emacs 18. -(fset 'screen-height 'frame-height) -(fset 'screen-width 'frame-width) +(defalias 'screen-height 'frame-height) +(defalias 'screen-width 'frame-width) (defun set-screen-width (cols &optional pretend) "Obsolete function to change the size of the screen to COLS columns.\n\ @@ -454,7 +454,7 @@ should use `set-frame-width' instead." ;;;; Key bindings (defvar ctl-x-5-map (make-sparse-keymap) "Keymap for frame commands.") -(fset 'ctl-x-5-prefix ctl-x-5-map) +(defalias 'ctl-x-5-prefix ctl-x-5-map) (define-key ctl-x-map "5" 'ctl-x-5-prefix) (define-key ctl-x-5-map "2" 'new-frame) diff --git a/lisp/gnuspost.el b/lisp/gnuspost.el index bb436b5501..b252f27dcf 100644 --- a/lisp/gnuspost.el +++ b/lisp/gnuspost.el @@ -115,9 +115,9 @@ If prefix argument YANK is non-nil, original article is yanked automatically." ;;; Post a News using NNTP ;;;###autoload -(fset 'sendnews 'gnus-post-news) +(defalias 'sendnews 'gnus-post-news) ;;;###autoload -(fset 'postnews 'gnus-post-news) +(defalias 'postnews 'gnus-post-news) ;;;###autoload (defun gnus-post-news () "Begin editing a new USENET news article to be posted. diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 4b2a4c4a4c..12be107e4b 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -40,10 +40,10 @@ ;; For Emacs V18 compatibility (and (not (fboundp 'user-original-login-name)) (fboundp 'user-real-login-name) - (fset 'user-original-login-name 'user-real-login-name)) + (defalias 'user-original-login-name 'user-real-login-name)) (and (not (fboundp 'buffer-disable-undo)) (fboundp 'buffer-flush-undo) - (fset 'buffer-disable-undo 'buffer-flush-undo)) + (defalias 'buffer-disable-undo 'buffer-flush-undo)) ; These variables now declared in paths.el. ;(defvar rmail-spool-directory "/usr/spool/mail/" diff --git a/lisp/mim-mode.el b/lisp/mim-mode.el index b5970de19e..1fb62e2f24 100644 --- a/lisp/mim-mode.el +++ b/lisp/mim-mode.el @@ -148,7 +148,7 @@ moving down a level of structure.") non-whitespace character in column 0 to be a toplevel object, otherwise only open paren syntax characters will be considered.") -(fset 'mdl-mode 'mim-mode) +(defalias 'mdl-mode 'mim-mode) (defun mim-mode () "Major mode for editing Mim (MDL in MDL) code. diff --git a/lisp/play/life.el b/lisp/play/life.el index 8e1732ed30..84dca781fa 100644 --- a/lisp/play/life.el +++ b/lisp/play/life.el @@ -117,7 +117,7 @@ generations (this defaults to 1)." (life-increment-generation) (life-display-generation sleeptime))))) -(fset 'life-mode 'life) +(defalias 'life-mode 'life) (put 'life-mode 'mode-class 'special) (random t) diff --git a/lisp/register.el b/lisp/register.el index 24487dac7b..3246345370 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -71,7 +71,7 @@ Argument is a character, naming the register." (interactive "cPoint to register: \nP") (set-register char (current-frame-configuration))) -(fset 'register-to-point 'jump-to-register) +(defalias 'register-to-point 'jump-to-register) (defun jump-to-register (char) "Move point to location stored in a register. If the register contains a window configuration (one frame) or a frame diff --git a/lisp/replace.el b/lisp/replace.el index 634c42691e..a3e2f03a5f 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -146,7 +146,7 @@ which will run faster and will not set the mark or print anything." (defvar regexp-history nil "History list for some commands that read regular expressions.") -(fset 'delete-non-matching-lines 'keep-lines) +(defalias 'delete-non-matching-lines 'keep-lines) (defun keep-lines (regexp) "Delete all lines except those containing matches for REGEXP. A match split across lines preserves all the lines it lies in. @@ -173,7 +173,7 @@ Applies to all lines after point." (and (not (eobp)) (= (match-beginning 0) (match-end 0)) (forward-char 1)))))) -(fset 'delete-matching-lines 'flush-lines) +(defalias 'delete-matching-lines 'flush-lines) (defun flush-lines (regexp) "Delete lines containing matches for REGEXP. If a match is split across lines, all the lines it lies in are deleted. @@ -189,7 +189,7 @@ Applies to lines after point." (point)) (progn (forward-line 1) (point)))))) -(fset 'count-matches 'how-many) +(defalias 'count-matches 'how-many) (defun how-many (regexp) "Print number of matches for REGEXP following point." (interactive (list (read-from-minibuffer @@ -258,7 +258,7 @@ in the buffer that the occurrences were found in. match. A negative number means to include that many lines before the match. A positive number means to include that many lines both before and after.") -(fset 'list-matching-lines 'occur) +(defalias 'list-matching-lines 'occur) (defun occur (regexp &optional nlines) "Show all lines in the current buffer containing a match for REGEXP. diff --git a/lisp/select.el b/lisp/select.el index bfcf20aa65..f82dc3127d 100644 --- a/lisp/select.el +++ b/lisp/select.el @@ -24,7 +24,7 @@ ;;; Code: ;; This is for temporary compatibility with pre-release Emacs 19. -(fset 'x-selection 'x-get-selection) +(defalias 'x-selection 'x-get-selection) (defun x-get-selection (&optional type data-type) "Return the value of an X Windows selection. The argument TYPE (default `PRIMARY') says which selection, diff --git a/lisp/shell.el b/lisp/shell.el index 0c405026e6..50562b21fa 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -454,7 +454,7 @@ Environment variables are expanded, see function substitute-in-file-name." (if shell-dirtrackp "ON" "OFF"))) ;;; For your typing convenience: -(fset 'dirtrack-toggle 'shell-dirtrack-toggle) +(defalias 'dirtrack-toggle 'shell-dirtrack-toggle) (defun shell-resync-dirs () @@ -502,7 +502,7 @@ command again." (error (message "Couldn't cd."))))))) ;;; For your typing convenience: -(fset 'dirs 'shell-resync-dirs) +(defalias 'dirs 'shell-resync-dirs) ;;; Show the current dirstack on the message line. diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index f653188e3f..a4084b0240 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -1119,8 +1119,8 @@ itself." (if (not (fboundp 'tar-real-normal-mode)) - (fset 'tar-real-normal-mode (symbol-function 'normal-mode))) -(fset 'normal-mode 'tar-normal-mode) + (defalias 'tar-real-normal-mode (symbol-function 'normal-mode))) +(defalias 'normal-mode 'tar-normal-mode) (provide 'tar-mode) diff --git a/lisp/textmodes/ispell4.el b/lisp/textmodes/ispell4.el index 4520ebcff0..0ad99c1e92 100644 --- a/lisp/textmodes/ispell4.el +++ b/lisp/textmodes/ispell4.el @@ -268,7 +268,7 @@ q, \\[keyboard-quit] Leave the command loop. You can come back later with \\[is (ispell-next)))) ;;;###autoload -(fset 'ispell-buffer 'ispell) +(defalias 'ispell-buffer 'ispell) (defun ispell-next () "Resume command loop for most recent ispell command." diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index a0864a79c0..f1808c2ec7 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -548,7 +548,7 @@ they are not defaultly assigned to keys." picture-mode-old-mode-name))) ;;;###autoload -(fset 'picture-mode 'edit-picture) +(defalias 'picture-mode 'edit-picture) (defun picture-mode-exit (&optional nostrip) "Undo edit-picture and return to previous major mode. diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 7835bfd120..2f8207070e 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -214,7 +214,7 @@ Set by \\[tex-region], \\[tex-buffer], and \\[tex-file].") (defvar tex-shell-map nil "Keymap for the tex-shell. A comint-mode-map with a few additions.") -;(fset 'TeX-mode 'tex-mode) ;in loaddefs. +;(defalias 'TeX-mode 'tex-mode) ;in loaddefs. ;;; This would be a lot simpler if we just used a regexp search, ;;; but then it would be too slow. @@ -244,9 +244,9 @@ is used." (if mode (funcall mode) (funcall tex-default-mode)))) ;;;###autoload -(fset 'TeX-mode 'tex-mode) +(defalias 'TeX-mode 'tex-mode) ;;;###autoload -(fset 'LaTeX-mode 'latex-mode) +(defalias 'LaTeX-mode 'latex-mode) ;;;###autoload (defun plain-tex-mode () @@ -299,7 +299,7 @@ subshell is initiated, the value of tex-shell-hook is called." (setq tex-trailer "\\bye\n") (run-hooks 'text-mode-hook 'tex-mode-hook 'plain-tex-mode-hook)) ;;;###autoload -(fset 'plain-TeX-mode 'plain-tex-mode) +(defalias 'plain-TeX-mode 'plain-tex-mode) ;;;###autoload (defun latex-mode () diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 76fc38b6d0..dd22631957 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -377,7 +377,7 @@ The appearance of the screen can be customized by the variables (other-window -1) (setq tc-other other)))) -(fset 'tc-mode 'tc-two-columns) +(defalias 'tc-mode 'tc-two-columns) ;;;###autoload (defun tc-associate-buffer () -- 2.20.1