Mercurial > hg > xemacs-beta
view lisp/obsolete.el @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Feb 2010 11:02:24 -0600 |
parents | 755ae5b97edb |
children | c17c857e20bf |
line wrap: on
line source
;;; obsolete.el --- obsoleteness support ;; Copyright (C) 1985-1994, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1994, 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 2002, 2004 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;; The obsoleteness support used to be scattered throughout various ;; source files. We put the stuff in one place to remove the junkiness ;; from other source files and to facilitate creating/updating things ;; like sysdep.el. ;;; Code: (defsubst define-obsolete-function-alias (oldfun newfun) "Define OLDFUN as an obsolete alias for function NEWFUN. This makes calling OLDFUN equivalent to calling NEWFUN and marks OLDFUN as obsolete." (define-function oldfun newfun) (make-obsolete oldfun newfun)) (defsubst define-compatible-function-alias (oldfun newfun) "Define OLDFUN as a compatible alias for function NEWFUN. This makes calling OLDFUN equivalent to calling NEWFUN and marks OLDFUN as provided for compatibility only." (define-function oldfun newfun) (make-compatible oldfun newfun)) (defsubst define-obsolete-variable-alias (oldvar newvar) "Define OLDVAR as an obsolete alias for variable NEWVAR. This makes referencing or setting OLDVAR equivalent to referencing or setting NEWVAR and marks OLDVAR as obsolete. If OLDVAR was bound and NEWVAR was not, Set NEWVAR to OLDVAR. Note: Use this before any other references (defvar/defcustom) to NEWVAR." (let ((needs-setting (and (boundp oldvar) (not (boundp newvar)))) (value (and (boundp oldvar) (symbol-value oldvar)))) (defvaralias oldvar newvar) (make-obsolete-variable oldvar newvar) (and needs-setting (set newvar value)))) (defsubst define-compatible-variable-alias (oldvar newvar) "Define OLDVAR as a compatible alias for variable NEWVAR. This makes referencing or setting OLDVAR equivalent to referencing or setting NEWVAR and marks OLDVAR as provided for compatibility only." (defvaralias oldvar newvar) (make-compatible-variable oldvar newvar)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; device stuff (make-compatible-variable 'window-system "use (console-type)") (defun x-display-color-p (&optional device) "Return t if DEVICE is a color device." (eq 'color (device-class device))) (make-compatible 'x-display-color-p 'device-class) (define-function 'x-color-display-p 'x-display-color-p) (make-compatible 'x-display-color-p 'device-class) (defun x-display-grayscale-p (&optional device) "Return t if DEVICE is a grayscale device." (eq 'grayscale (device-class device))) (make-compatible 'x-display-grayscale-p 'device-class) (define-function 'x-grayscale-display-p 'x-display-grayscale-p) (make-compatible 'x-display-grayscale-p 'device-class) (define-compatible-function-alias 'x-display-pixel-width 'device-pixel-width) (define-compatible-function-alias 'x-display-pixel-height 'device-pixel-height) (define-compatible-function-alias 'x-display-planes 'device-bitplanes) (define-compatible-function-alias 'x-display-color-cells 'device-color-cells) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; events (define-obsolete-function-alias 'menu-event-p 'misc-user-event-p) (make-obsolete-variable 'unread-command-char 'unread-command-events) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; extents (make-obsolete 'set-window-dot 'set-window-point) (define-obsolete-function-alias 'extent-buffer 'extent-object) (define-compatible-variable-alias 'parse-sexp-lookup-properties 'lookup-syntax-properties) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; frames (defun frame-first-window (frame) "Return the topmost, leftmost window of FRAME. If omitted, FRAME defaults to the currently selected frame." (frame-highest-window frame 0)) (make-compatible 'frame-first-window 'frame-highest-window) (define-obsolete-variable-alias 'initial-frame-alist 'initial-frame-plist) (define-obsolete-variable-alias 'minibuffer-frame-alist 'minibuffer-frame-plist) (define-obsolete-variable-alias 'pop-up-frame-alist 'pop-up-frame-plist) (define-obsolete-variable-alias 'special-display-frame-alist 'special-display-frame-plist) ;; Defined in C. (define-obsolete-variable-alias 'default-frame-alist 'default-frame-plist) (define-obsolete-variable-alias 'default-x-frame-alist 'default-x-frame-plist) (define-obsolete-variable-alias 'default-tty-frame-alist 'default-tty-frame-plist) (make-compatible 'frame-parameters 'frame-property) (defun frame-parameters (&optional frame) "Return the parameters-alist of frame FRAME. It is a list of elements of the form (PARM . VALUE), where PARM is a symbol. The meaningful PARMs depend on the kind of frame. If FRAME is omitted, return information on the currently selected frame. See the variables `default-frame-plist', `default-x-frame-plist', and `default-tty-frame-plist' for a description of the parameters meaningful for particular types of frames." (or frame (setq frame (selected-frame))) ;; #### This relies on a `copy-sequence' of the user properties in ;; `frame-properties'. Removing that would make `frame-properties' more ;; efficient but this function less efficient, as we couldn't be ;; destructive. Since most callers now use `frame-parameters', we'll ;; do it this way. Should probably change this at some point in the ;; future. (destructive-plist-to-alist (frame-properties frame))) (make-compatible 'frame-parameter 'frame-property) (defun frame-parameter (frame parameter) "Return FRAME's value for parameter PARAMETER. If FRAME is nil, describe the currently selected frame." (cdr (assq parameter (frame-parameters frame)))) (make-compatible 'modify-frame-parameters 'set-frame-properties) (defun modify-frame-parameters (frame alist) "Modify the properties of frame FRAME according to ALIST. ALIST is an alist of properties to change and their new values. Each element of ALIST has the form (PARM . VALUE), where PARM is a symbol. The meaningful PARMs depend on the kind of frame. See `set-frame-properties' for built-in property names." ;; it would be nice to be destructive here but that's not safe. (set-frame-properties frame (alist-to-plist alist))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; faces (define-obsolete-function-alias 'list-faces-display 'edit-faces) (define-obsolete-function-alias 'list-faces 'face-list) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; paths (defvar Info-default-directory-list nil "This used to be the initial value of Info-directory-list. If you want to change the locations where XEmacs looks for info files, set Info-directory-list.") (make-obsolete-variable 'Info-default-directory-list 'Info-directory-list) (defvar init-file-user nil "This used to be the name of the user whose init file was read at startup.") (make-obsolete-variable 'init-file-user 'load-user-init-file-p) (define-obsolete-function-alias 'pui-add-install-directory 'pui-set-local-package-get-directory) ; misleading name ;;;;;;;;;;;;;;;;;;;;;;;;;;;; hooks (make-compatible-variable 'lisp-indent-hook 'lisp-indent-function) (make-compatible-variable 'comment-indent-hook 'comment-indent-function) (make-obsolete-variable 'temp-buffer-show-hook 'temp-buffer-show-function) (make-obsolete-variable 'inhibit-local-variables "use `enable-local-variables' (with the reversed sense).") (make-obsolete-variable 'suspend-hooks 'suspend-hook) (make-obsolete-variable 'first-change-function 'first-change-hook) (make-obsolete-variable 'before-change-function "use before-change-functions; which is a list of functions rather than a single function.") (make-obsolete-variable 'after-change-function "use after-change-functions; which is a list of functions rather than a single function.") ;;;;;;;;;;;;;;;;;;;;;;;;;;;; insertion and deletion (define-compatible-function-alias 'insert-and-inherit 'insert) (define-compatible-function-alias 'insert-before-markers-and-inherit 'insert-before-markers) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; keymaps (defun keymap-parent (keymap) "Return the first parent of the given keymap." (car (keymap-parents keymap))) (make-compatible 'keymap-parent 'keymap-parents) (defun set-keymap-parent (keymap parent) "Make the given keymap have (only) the given parent." (set-keymap-parents keymap (if parent (list parent) '())) parent) (make-compatible 'set-keymap-parent 'set-keymap-parents) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; menu stuff (defun add-menu-item (menu-path item-name function enabled-p &optional before) "Obsolete. See the function `add-menu-button'." (or item-name (error "must specify an item name")) (declare-fboundp (add-menu-button menu-path (vector item-name function enabled-p) before))) (make-obsolete 'add-menu-item 'add-menu-button) (defun add-menu (menu-path menu-name menu-items &optional before) "See the function `add-submenu'." (or menu-name (error "must specify a menu name")) (or menu-items (error "must specify some menu items")) (declare-fboundp (add-submenu menu-path (cons menu-name menu-items) before))) ;; Can't make this obsolete. easymenu depends on it. (make-compatible 'add-menu 'add-submenu) (define-obsolete-function-alias 'package-get-download-menu 'package-ui-download-menu) (unless (featurep 'menubar) ;; Don't provide the last three functions unless the menubar feature is ;; available. This approach (with #'unintern) avoids warnings about lost ;; docstrings since make-docfile doesn't parse bytecode. (mapc #'unintern '(add-menu-item add-menu package-get-download-menu))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; minibuffer (define-compatible-function-alias 'read-minibuffer 'read-expression) ; misleading name (define-compatible-function-alias 'read-input 'read-string) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; misc ;; (defun user-original-login-name () ;; "Return user's login name from original login. ;; This tries to remain unaffected by `su', by looking in environment variables." ;; (or (getenv "LOGNAME") (getenv "USER") (user-login-name))) (define-obsolete-function-alias 'user-original-login-name 'user-login-name) ; old names (define-obsolete-function-alias 'show-buffer 'set-window-buffer) (define-obsolete-function-alias 'buffer-flush-undo 'buffer-disable-undo) (make-compatible 'eval-current-buffer 'eval-buffer) (define-compatible-function-alias 'byte-code-function-p 'compiled-function-p) ;FSFmacs (define-obsolete-function-alias 'isearch-yank-x-selection 'isearch-yank-selection) (define-obsolete-function-alias 'isearch-yank-x-clipboard 'isearch-yank-clipboard) ;; too bad there's not a way to check for aref, assq, and nconc ;; being called on the values of functions known to return keymaps, ;; or known to return vectors of events instead of strings... ;;; Yes there is; make compiler macros for aref, assq, nconc, checking that ;;; the car of the relevant argument is sane. (make-obsolete-variable 'executing-macro 'executing-kbd-macro) (define-compatible-function-alias 'interactive-form 'function-interactive) ;GNU 21.1 (define-compatible-function-alias 'assq-delete-all 'remassq) ;GNU 21.1 (defun makehash (&optional test) "Create a new hash table. Optional first argument TEST specifies how to compare keys in the table. Predefined tests are `eq', `eql', and `equal'. Default is `eql'." (make-hash-table :test test)) (make-compatible 'makehash 'make-hash-table) (defun buffer-local-value (variable buffer) "Return the value of VARIABLE in BUFFER. If VARIABLE does not have a buffer-local binding in BUFFER, the value is the default binding of variable." (symbol-value-in-buffer variable buffer)) (make-compatible 'buffer-local-value 'symbol-value-in-buffer) (define-compatible-function-alias 'line-beginning-position 'point-at-bol) (define-compatible-function-alias 'line-end-position 'point-at-eol) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; modeline (define-compatible-function-alias 'redraw-mode-line 'redraw-modeline) (define-compatible-function-alias 'force-mode-line-update 'redraw-modeline) ;; FSF compatibility (define-compatible-variable-alias 'mode-line-map 'modeline-map) (define-compatible-variable-alias 'mode-line-buffer-identification 'modeline-buffer-identification) (define-compatible-variable-alias 'mode-line-process 'modeline-process) (define-compatible-variable-alias 'mode-line-modified 'modeline-modified) (make-compatible-variable 'mode-line-inverse-video "use set-face-highlight-p and set-face-reverse-p") (define-compatible-variable-alias 'default-mode-line-format 'default-modeline-format) (define-compatible-variable-alias 'mode-line-format 'modeline-format) (define-compatible-variable-alias 'mode-line-menu 'modeline-menu) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; mouse ;;; (defun mouse-eval-last-sexpr (event) ;;; (interactive "@e") ;;; (save-excursion ;;; (mouse-set-point event) ;;; (eval-last-sexp nil))) (define-obsolete-function-alias 'mouse-eval-last-sexpr 'mouse-eval-sexp) (defun read-mouse-position (frame) (cdr (mouse-position (frame-device frame)))) (make-obsolete 'read-mouse-position 'mouse-position) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; redisplay (defun redraw-display (&optional device) (if (eq device t) (mapcar 'redisplay-device (device-list)) (redisplay-device device))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; strings (define-obsolete-function-alias 'sref 'aref) (defun char-bytes (character) "Return number of bytes a CHARACTER occupies in a string or buffer. It always returns 1 in XEmacs, and in recent FSF Emacs versions." 1) (make-obsolete 'char-bytes "This function always returns 1") (defun find-non-ascii-charset-string (string) "Return a list of charsets in the STRING except ascii. It might be available for compatibility with Mule 2.3, because its `find-charset-string' ignores ASCII charset." (delq 'ascii (and-fboundp #'charsets-in-string (charsets-in-string string)))) (make-obsolete 'find-non-ascii-charset-string "use (delq 'ascii (charsets-in-string STRING)) instead.") (defun find-non-ascii-charset-region (start end) "Return a list of charsets except ascii in the region between START and END. It might be available for compatibility with Mule 2.3, because its `find-charset-string' ignores ASCII charset." (delq 'ascii (and-fboundp #'charsets-in-region (charsets-in-region start end)))) (make-obsolete 'find-non-ascii-charset-region "use (delq 'ascii (charsets-in-region START END)) instead.") ;; < 21.5 compatibility, eg. https://bugzilla.redhat.com/201524#c2 (define-obsolete-function-alias 'string-to-char-list 'string-to-list) ;;;;;;;;;;;;;;;;;;;;;;;;;;;; window-system objects ;; the functionality of column.el has been moved into C ;; Function obsoleted for XEmacs 20.0/February 1997. (defalias 'display-column-mode 'column-number-mode) (defun x-color-values (color &optional frame) "Return a description of the color named COLOR on frame FRAME. The value is a list of integer RGB values--(RED GREEN BLUE). These values appear to range from 0 to 65280 or 65535, depending on the system; white is (65280 65280 65280) or (65535 65535 65535). If FRAME is omitted or nil, use the selected frame." (color-instance-rgb-components (make-color-instance color))) (make-compatible 'x-color-values 'color-instance-rgb-components) (make-obsolete 'mswindows-color-list 'color-list) (make-obsolete 'tty-color-list 'color-list) (make-compatible 'list-fonts 'font-list) ;; Two loser functions which shouldn't be used. (make-obsolete 'following-char 'char-after) (make-obsolete 'preceding-char 'char-before) ;; Keywords already do The Right Thing in XEmacs (make-compatible 'define-widget-keywords "Just use them") (make-obsolete 'function-called-at-point 'function-at-point) ;; As of 21.5, #'throw is a special operator. This makes bytecode using it ;; compiled for 21.4 fail; making this function available works around that. (defun obsolete-throw (tag value) "Ugly compatibility hack. See the implementation of #'funcall in eval.c. This should be removed once we no longer encounter bytecode from 21.4." (throw tag value)) (make-obsolete 'obsolete-throw "it says `obsolete' in the name, you know you shouldn't be using this.") (provide 'obsolete) ;;; obsolete.el ends here