Mercurial > hg > xemacs-beta
annotate lisp/cus-dep.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 | b4a8cd0dd8df |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; cus-dep.el --- Find customization dependencies. |
| 2 ;; | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 1298 | 4 ;; Copyright (C) 2003 Ben Wing. |
| 428 | 5 ;; |
| 6 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>, then | |
| 7 ;; Richard Stallman <rms@gnu.ai.mit.edu>, then | |
| 8 ;; Hrvoje Niksic <hniksic@xemacs.org> (rewritten for XEmacs) | |
| 9 ;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org> | |
| 10 ;; Keywords: internal | |
| 11 | |
| 12 ;; This file is part of XEmacs. | |
| 13 | |
| 14 ;; XEmacs is free software; you can redistribute it and/or modify | |
| 15 ;; it under the terms of the GNU General Public License as published by | |
| 16 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 17 ;; any later version. | |
| 18 | |
| 19 ;; XEmacs is distributed in the hope that it will be useful, | |
| 20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 22 ;; GNU General Public License for more details. | |
| 23 | |
| 24 ;; You should have received a copy of the GNU General Public License | |
| 25 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 26 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 27 ;; Boston, MA 02111-1307, USA. | |
| 28 | |
| 29 ;;; Synched up with: Not synched with FSF. | |
| 30 | |
| 31 | |
| 32 ;;; Commentary: | |
| 33 | |
| 34 ;; This file generates the custom-load files, loaded by cus-load.el. | |
| 442 | 35 ;; Entry points are `Custom-make-dependencies' and |
| 36 ;; `Custom-make-one-dependency'. | |
| 428 | 37 |
| 38 ;; It works by scanning all the `.el' files in a directory, and | |
| 39 ;; evaluates any `defcustom', `defgroup', or `defface' expression that | |
| 40 ;; it finds. The symbol changed by this expression is stored to a | |
| 41 ;; hash table as the hash key, file name being the value. | |
| 42 | |
| 43 ;; After all the files have been examined, custom-loads.el is | |
| 44 ;; generated by mapping all the atoms, and seeing if any of them | |
| 45 ;; contains a `custom-group' property. This property is a list whose | |
| 46 ;; each element's car is the "child" group symbol. If that property | |
| 47 ;; is in the hash-table, the file name will be looked up from the | |
| 48 ;; hash-table, and added to cusload-file. Because the hash-table is | |
| 49 ;; cleared whenever we process a new directory, we cannot get confused | |
| 50 ;; by custom-loads from another directory, or from a previous | |
| 51 ;; installation. This is also why it is perfectly safe to have old | |
| 52 ;; custom-loads around, and have them loaded by `cus-load.el' (as | |
| 53 ;; invoked by `cus-edit.el'). | |
| 54 | |
| 55 ;; A trivial, but useful optimization is that if cusload-file exists, | |
| 56 ;; and no .el files in the directory are newer than cusload-file, it | |
| 57 ;; will not be generated. This means that the directories where | |
| 58 ;; nothing has changed will be skipped. | |
| 59 | |
| 60 ;; The `custom-add-loads' function, used by files generated by | |
| 61 ;; `Custom-make-dependencies', updates the symbol's `custom-loads' | |
| 62 ;; property (a list of strings) with a new list of strings, | |
| 63 ;; eliminating the duplicates. Additionally, it adds the symbol to | |
| 64 ;; `custom-group-hash-table'. It is defined in `cus-load.el'. | |
| 65 | |
| 66 ;; Example: | |
| 67 | |
| 68 ;; (custom-add-loads 'foo 'custom-loads '("bar" "baz")) | |
| 69 ;; (get 'foo 'custom-loads) | |
| 70 ;; => ("bar" "baz") | |
| 71 ;; | |
| 72 ;; (custom-add-loads 'foo 'custom-loads '("hmph" "baz" "quz")) | |
| 73 ;; (get 'foo 'custom-loads) | |
| 74 ;; => ("bar" "baz" "hmph" "qux") | |
| 75 | |
| 76 ;; Obviously, this allows correct incremental loading of custom-load | |
| 77 ;; files. This is not necessary under FSF (they simply use `put'), | |
| 78 ;; since they have only one file with custom dependencies. With the | |
| 79 ;; advent of packages, we cannot afford the same luxury. | |
| 1298 | 80 ;; |
| 81 ;; Feb 2003: Added code to speed up building by caching the values we've | |
| 82 ;; constructed, and using them instead of scanning a file when custom-load | |
| 83 ;; is up-to-date w.r.t. the file. Also use `message' not `princ' to print | |
| 84 ;; out messages so nl's are correctly inserted when necessary. --ben | |
| 428 | 85 |
| 86 | |
| 87 ;;; Code: | |
| 88 | |
| 89 (require 'cl) | |
| 90 (require 'widget) | |
| 91 (require 'cus-face) | |
| 92 | |
| 1244 | 93 ;; #### This and the autoloads file naming variables belong in a separate |
| 94 ;; file to be required here. | |
| 95 ;; #### Compare this with the autoloads handling. | |
| 428 | 96 ;; Don't change this, unless you plan to change the code in |
| 97 ;; cus-start.el, too. | |
| 98 (defconst cusload-base-file "custom-load.el") | |
| 1298 | 99 (defconst cusload-hash-table-marker ";old-cus-dep-hash: ") |
| 428 | 100 |
| 101 ;; Be very careful when changing this function. It looks easy to | |
| 102 ;; understand, but is in fact very easy to break. Be sure to read and | |
| 103 ;; understand the commentary above! | |
| 104 | |
| 442 | 105 (defun Custom-make-dependencies-1 (subdirs) |
| 428 | 106 (setq subdirs (mapcar #'expand-file-name subdirs)) |
| 107 (with-temp-buffer | |
| 108 (let ((enable-local-eval nil) | |
| 1298 | 109 (hash (make-hash-table :test 'eq)) |
| 110 (hash-cache (make-hash-table :test 'equal)) | |
| 111 old-hash) | |
| 428 | 112 (dolist (dir subdirs) |
| 1298 | 113 (message "Processing %s\n" dir) |
| 428 | 114 (let ((cusload-file (expand-file-name cusload-base-file dir)) |
| 115 (files (directory-files dir t "\\`[^=].*\\.el\\'"))) | |
| 116 ;; A trivial optimization: if no file in the directory is | |
| 117 ;; newer than custom-load.el, no need to do anything! | |
| 118 (if (and (file-exists-p cusload-file) | |
| 119 (dolist (file files t) | |
| 120 (when (file-newer-than-file-p file cusload-file) | |
| 121 (return nil)))) | |
| 1298 | 122 (message "(No changes need to be written)") |
| 123 (when (file-exists-p cusload-file) | |
| 124 (let ((buf (find-file-noselect cusload-file))) | |
| 125 (with-current-buffer buf | |
| 126 (goto-char (point-min)) | |
| 127 (when (search-forward cusload-hash-table-marker nil t) | |
| 128 (setq old-hash (read buf)))) | |
| 129 (kill-buffer buf))) | |
| 428 | 130 ;; Process directory |
| 131 (dolist (file files) | |
| 1298 | 132 (let ((old-cache (if (hash-table-p old-hash) |
| 133 (gethash file old-hash t) | |
| 134 t))) | |
| 135 (if (and (not (file-newer-than-file-p file cusload-file)) | |
| 136 (not (eq old-cache t))) | |
| 137 (progn | |
| 138 (dolist (c old-cache) | |
| 139 (puthash (car c) (cdr c) hash)) | |
| 140 (puthash file old-cache hash-cache)) | |
| 141 (erase-buffer) | |
| 142 (insert-file-contents file) | |
| 143 (goto-char (point-min)) | |
| 144 (let ((name (file-name-sans-extension | |
| 145 (file-name-nondirectory file))) | |
| 146 cache | |
| 147 (first t)) | |
| 148 ;; Search for defcustom/defface/defgroup | |
| 149 ;; expressions, and evaluate them. | |
| 150 (while (re-search-forward | |
| 151 "^(defcustom\\|^(defface\\|^(defgroup" | |
| 152 nil t) | |
| 153 (when first | |
| 154 (message "Computing custom-loads for %s..." name) | |
| 155 (setq first nil)) | |
| 156 (beginning-of-line) | |
| 157 (let ((expr (read (current-buffer)))) | |
| 158 ;; We need to ignore errors here, so that | |
| 159 ;; defcustoms with :set don't bug out. Of | |
| 160 ;; course, their values will not be assigned in | |
| 161 ;; case of errors, but their `custom-group' | |
| 162 ;; properties will by that time be in place, and | |
| 163 ;; that's all we care about. | |
| 164 (ignore-errors | |
| 165 (eval expr)) | |
| 166 ;; Hash the file of the affected symbol. | |
| 167 (setf (gethash (nth 1 expr) hash) name) | |
| 168 ;; Remember the values computed. | |
| 169 (push (cons (nth 1 expr) name) cache))) | |
| 170 (or cache | |
| 171 (message "No custom-loads for %s" name)) | |
| 172 (puthash file cache hash-cache))) | |
| 173 )) | |
| 428 | 174 (cond |
| 175 ((zerop (hash-table-count hash)) | |
| 2544 | 176 (message "(No customization dependencies)") |
| 177 (write-region "" nil cusload-file)) | |
| 428 | 178 (t |
| 1298 | 179 (message "Generating %s...\n" cusload-base-file) |
| 428 | 180 (with-temp-file cusload-file |
| 181 (insert ";;; " cusload-base-file | |
| 182 " --- automatically extracted custom dependencies\n" | |
| 1298 | 183 "\n;;; Code:\n\n") |
| 184 (insert cusload-hash-table-marker) | |
| 185 (let ((print-readably t) | |
| 186 (standard-output (current-buffer))) | |
| 187 (princ hash-cache) | |
| 188 (terpri)) | |
| 189 (insert "(autoload 'custom-add-loads \"cus-load\")\n\n") | |
| 428 | 190 (mapatoms |
| 191 (lambda (sym) | |
| 192 (let ((members (get sym 'custom-group)) | |
| 193 item where found) | |
| 194 (when members | |
| 195 (while members | |
| 196 (setq item (car (car members)) | |
| 197 members (cdr members) | |
| 198 where (gethash item hash)) | |
| 199 (unless (or (null where) | |
| 200 (member where found)) | |
| 201 (if found | |
| 202 (insert " ") | |
| 203 (insert "(custom-add-loads '" | |
| 204 (prin1-to-string sym) " '(")) | |
| 205 (prin1 where (current-buffer)) | |
| 206 (push where found))) | |
| 207 (when found | |
| 208 (insert "))\n")))))) | |
| 209 (insert "\n;;; custom-load.el ends here\n")) | |
| 210 (clrhash hash))))))))) | |
| 211 | |
| 442 | 212 (defun Custom-make-one-dependency () |
| 213 "Extract custom dependencies from .el files in one dir, on the command line. | |
| 214 Like `Custom-make-dependencies' but snarfs only one command-line argument, | |
| 215 making it useful in a chain of batch commands in a single XEmacs invocation." | |
| 216 (let ((subdir (car command-line-args-left))) | |
| 217 (setq command-line-args-left (cdr command-line-args-left)) | |
| 218 (Custom-make-dependencies-1 (list subdir)))) | |
| 219 | |
| 220 ;;;###autoload | |
| 221 (defun Custom-make-dependencies (&optional subdirs) | |
| 222 "Extract custom dependencies from .el files in SUBDIRS. | |
| 223 SUBDIRS is a list of directories. If it is nil, the command-line | |
| 224 arguments are used. If it is a string, only that directory is | |
| 225 processed. This function is especially useful in batch mode. | |
| 226 | |
| 227 Batch usage: xemacs -batch -l cus-dep.el -f Custom-make-dependencies DIRS" | |
| 228 (interactive "DDirectory: ") | |
| 229 (and (stringp subdirs) | |
| 230 (setq subdirs (list subdirs))) | |
| 231 (or subdirs | |
| 232 ;; Usurp the command-line-args | |
| 233 (setq subdirs command-line-args-left | |
| 234 command-line-args-left nil)) | |
| 235 (Custom-make-dependencies-1 subdirs)) | |
| 236 | |
| 428 | 237 (provide 'cus-dep) |
| 238 | |
| 239 ;;; cus-dep.el ends here |