Mercurial > emacs
view lisp/cus-dep.el @ 109573:228a5fa4eda0
Remove extern declarations from .c files, and them to .h files.
* src/xsmfns.c (Vuser_login_name):
* src/xrdb.c (Vdouble_click_time):
* src/xfaces.c (xic_create_fontsetname):
* src/w32select.c (waiting_for_input):
* src/print.c (minibuffer_auto_raise):
* src/msdos.c (Qhelp_echo):
* src/macros.c (real_this_command):
* src/keymap.c (Voverriding_local_map):
* src/xterm.c (poll_for_input_1, gray_bitmap_width)
(gray_bitmap_height, gray_bitmap_bits;
* src/xmenu.c ( Voverriding_local_map)
(Voverriding_local_map_menu_flag; Qmenu_item; use_dialog_box)
(use_file_dialog, Xt_app_con):
* src/xdisp.c (minibuffer_auto_raise, Voverriding_local_map)
(Voverriding_local_map_menu_flag, Qmenu_item, Qface, Qinvisible)
(Qwidth, Qinvisible, Qwindow, Qpriority, Qtool_bar_lines)
(Qtool_bar_lines, ignore_mouse_drag_p):
* src/minibuf.c (Voverriding_local_map, Qfield, Qfront_sticky)
(Qrear_nonsticky, nconc2):
* src/keyboard.c (current_global_map, minibuf_level, Qmenu_item)
(Vhistory_length, Vtranslation_table_for_input, Qcomposition)
(Qdisplay, Qafter_string, Qbefore_string, Qundefined):
* src/fileio.c (use_dialog_box, use_file_dialog, Vuser_login_name)
(minibuf_level, minibuffer_auto_raise, lisp_time_argument):
* src/eval.c (Qinteractive_form, Qrisky_local_variable, Qfunction)
(gc_in_progress):
* src/doc.c (Voverriding_local_map, Qremap):
* src/dired.c (completion_ignore_case, Qcompletion_ignore_case)
(Vcompletion_regexp_list):
* src/coding.c (Qmac, Qinsert_file_contents, Qwrite_region)
(Qcompletion_ignore_case):
* src/callint.c (Qcursor_in_echo_area, Qfile_directory_p, Qonly)
(Vhistory_length, Vthis_original_command, real_this_command)
(Qface, Qminibuffer_prompt, history_delete_duplicates):
* src/image.c (Qrisky_local_variable):
* src/fontset.c (QCname):
* src/fns.c (minibuffer_auto_raise, QCname):
* src/dispnew.c (char_ins_del_cost):
* src/composite.c (font_fill_lglyph_metrics):
* src/cmds.c (Qface, Vtranslation_table_for_input):
* src/charset.c (map_char_table_for_charset, Qfile_name_handler_alist):
* src/ccl.c (charset_unicode):
* src/callproc.c (Vtemporary_file_directory):
* src/buffer.c (emacs_strerror): Remove extern declarations.
Remove extern declarations from .c files, and them to .h files.
* src/keyboard.h (Qhelp_echo, waiting_for_input)
(input_available_clear_time, ignore_mouse_drag_p)
(Vdouble_click_time, real_this_command, Vthis_original_command):
* src/keymap.h (Qremap, Qmenu_item, Voverriding_local_map)
(Voverriding_local_map_menu_flag):
* src/lisp.h (Qinteractive_form, use_file_dialog)
(Qcursor_in_echo_area, QCascent, QCmargin, QCrelief, Qcount)
(Qextension_data, QCconversion, QCcolor_symbols, QCheuristic_mask)
(QCindex, QCmatrix, QCcolor_adjustment, QCmask)
(Qrisky_local_variable, map_char_table_for_charset, Vprint_level)
(Qfunction, debug_on_next_call, Qfield)
(Vinhibit_field_text_motion, Vuser_login_name, lisp_time_argument)
(Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string)
(Qfile_directory_p, Qinsert_file_contents)
(Qcompletion_ignore_case, Qcompletion_ignore_case)
(Vcompletion_regexp_list, Vhistory_length, completion_ignore_case)
(history_delete_duplicates, minibuffer_auto_raise, Qonly)
(Qfile_name_handler_alist, Qfront_sticky, Qrear_nonsticky)
(Qminibuffer_prompt)
(Vtemporary_file_directory,char_ins_del_vector, Qface):
* src/xterm.h (gray_bitmap_width, gray_bitmap_height)
(gray_bitmap_bits, xic_create_fontsetname):
* src/coding.h (Vtranslation_table_for_input): Add extern declarations.
* src/data.c (Qwindow): Make non-static, used from other files too.
* src/frame.c (validate_x_resource_name): Remove shadow definition for i.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Wed, 28 Jul 2010 22:48:06 -0700 |
parents | 1d1d5d9bd884 |
children | 280c8ae2476d 376148b31b5e |
line wrap: on
line source
;;; cus-dep.el --- find customization dependencies ;; ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Keywords: internal ;; This file is part of GNU Emacs. ;; GNU Emacs 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 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;;; Code: (eval-when-compile (require 'cl)) (require 'widget) (require 'cus-face) (defvar generated-custom-dependencies-file "cus-load.el" "Output file for `custom-make-dependencies'.") ;; See finder-no-scan-regexp in finder.el. (defvar custom-dependencies-no-scan-regexp "\\(^\\.#\\|\\(loaddefs\\|\ ldefs-boot\\|cus-load\\|finder-inf\\|esh-groups\\|subdirs\\)\\.el$\\)" "Regexp matching file names not to scan for `custom-make-dependencies'.") (autoload 'autoload-rubric "autoload") (defun custom-make-dependencies () "Batch function to extract custom dependencies from .el files. Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" (let ((enable-local-eval nil)) (with-temp-buffer (dolist (subdir command-line-args-left) (message "Directory %s" subdir) (let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'")) (default-directory (expand-file-name subdir)) (preloaded (concat "\\`" (regexp-opt (mapcar (lambda (f) (file-name-sans-extension (file-name-nondirectory f))) preloaded-file-list) t) "\\.el\\'"))) (dolist (file files) (unless (or (string-match custom-dependencies-no-scan-regexp file) (string-match preloaded file) (not (file-exists-p file))) (erase-buffer) (insert-file-contents file) (goto-char (point-min)) (string-match "\\`\\(.*\\)\\.el\\'" file) (let ((name (file-name-nondirectory (match-string 1 file))) (load-file-name file)) (if (save-excursion (re-search-forward (concat "(provide[ \t\n]+\\('\\|(quote[ \t\n]\\)[ \t\n]*" (regexp-quote name) "[ \t\n)]") nil t)) (setq name (intern name))) (condition-case nil (while (re-search-forward "^(def\\(custom\\|face\\|group\\)" nil t) (beginning-of-line) (let ((expr (read (current-buffer)))) (condition-case nil (let ((custom-dont-initialize t)) (eval expr) (put (nth 1 expr) 'custom-where name)) (error nil)))) (error nil))))))))) (message "Generating %s..." generated-custom-dependencies-file) (set-buffer (find-file-noselect generated-custom-dependencies-file)) (setq buffer-undo-list t) (erase-buffer) (insert (autoload-rubric generated-custom-dependencies-file "custom dependencies" t)) (search-backward "") (mapatoms (lambda (symbol) (let ((members (get symbol 'custom-group)) where found) (when members (dolist (member ;; So x and no-x builds won't differ. (sort (mapcar 'car members) 'string<)) (setq where (get member 'custom-where)) (unless (or (null where) (member where found)) (push where found))) (when found (insert "(put '" (symbol-name symbol) " 'custom-loads '") (prin1 (nreverse found) (current-buffer)) (insert ")\n")))))) (insert "\ ;; These are for handling :version. We need to have a minimum of ;; information so `customize-changed-options' could do its job. ;; For groups we set `custom-version', `group-documentation' and ;; `custom-tag' (which are shown in the customize buffer), so we ;; don't have to load the file containing the group. ;; `custom-versions-load-alist' is an alist that has as car a version ;; number and as elts the files that have variables or faces that ;; contain that version. These files should be loaded before showing ;; the customization buffer that `customize-changed-options' ;; generates. ;; This macro is used so we don't modify the information about ;; variables and groups if it's already set. (We don't know when ;; " (file-name-nondirectory generated-custom-dependencies-file) " is going to be loaded and at that time some of the ;; files might be loaded and some others might not). \(defmacro custom-put-if-not (symbol propname value) `(unless (get ,symbol ,propname) (put ,symbol ,propname ,value))) ") (let ((version-alist nil)) (mapatoms (lambda (symbol) (let ((version (get symbol 'custom-version)) where) (when version (setq where (get symbol 'custom-where)) (when where (if (or (custom-variable-p symbol) (custom-facep symbol)) ;; This means it's a variable or a face. (progn (if (assoc version version-alist) (unless (member where (cdr (assoc version version-alist))) (push where (cdr (assoc version version-alist)))) (push (list version where) version-alist))) ;; This is a group (insert "(custom-put-if-not '" (symbol-name symbol) " 'custom-version ") (prin1 version (current-buffer)) (insert ")\n") (insert "(custom-put-if-not '" (symbol-name symbol)) (insert " 'group-documentation ") (prin1 (get symbol 'group-documentation) (current-buffer)) (insert ")\n") (when (get symbol 'custom-tag) (insert "(custom-put-if-not '" (symbol-name symbol)) (insert " 'custom-tag ") (prin1 (get symbol 'custom-tag) (current-buffer)) (insert ")\n")) )))))) (insert "\n(defvar custom-versions-load-alist " (if version-alist "'" "")) (prin1 version-alist (current-buffer)) (insert "\n \"For internal use by custom.\")\n")) (save-buffer) (message "Generating %s...done" generated-custom-dependencies-file)) ;; arch-tag: b7b6421a-bf7a-44fd-a382-6f44976bdf68 ;;; cus-dep.el ends here