Mercurial > hg > xemacs-beta
annotate lisp/lib-complete.el @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 26 Jan 2010 23:22:30 -0600 |
| parents | 37bdd24225ef |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; lib-complete.el --- Completion on the lisp search path |
| 2 | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 1123 | 4 ;; Copyright (C) 1991 Mike Williams <mike-w@cs.aukuni.ac.nz>. |
| 5 ;; Copyright (C) 2002 Ben Wing. | |
| 428 | 6 |
| 7 ;; Author: Mike Williams <mike-w@cs.aukuni.ac.nz> | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: lisp, extensions, dumped | |
| 10 ;; Created: Sat Apr 20 17:47:21 1991 | |
| 11 | |
| 12 ;; This file is part of XEmacs. | |
| 13 | |
| 14 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 15 ;; 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, but | |
| 20 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 22 ;; 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 in FSF. | |
| 30 | |
| 31 ;;; Commentary: | |
| 32 | |
| 33 ;; This file is dumped with XEmacs. | |
| 34 | |
| 35 ;; Many thanks to Hallvard Furuseth <hallvard@ifi.uio.no> for his | |
| 36 ;; helpful suggestions. | |
| 37 | |
| 38 ;;; ChangeLog: | |
| 39 | |
| 40 ;; 4/26/97: sb Mule-ize. | |
| 41 ;; 6/24/1999 much rewriting from Bob Weiner | |
| 42 | |
| 43 ;;; Code: | |
| 44 | |
| 45 ;;=== Determine completions for filename in search path =================== | |
| 46 | |
| 47 (defun library-all-completions (FILE SEARCH-PATH &optional FULL FAST) | |
| 48 "Return all completions for FILE in any directory on SEARCH-PATH. | |
| 49 If optional third argument FULL is non-nil, returned pathnames should be | |
| 50 absolute rather than relative to some directory on the SEARCH-PATH. | |
| 51 If optional fourth argument FAST is non-nil, don't sort the completions, | |
| 52 or remove duplicates." | |
| 53 (setq FILE (or FILE "")) | |
| 54 (if (file-name-absolute-p FILE) | |
| 55 ;; It's an absolute file name, so don't need SEARCH-PATH | |
| 56 (progn | |
| 57 (setq FILE (expand-file-name FILE)) | |
| 58 (file-name-all-completions | |
| 59 (file-name-nondirectory FILE) (file-name-directory FILE))) | |
| 60 (let ((subdir (file-name-directory FILE)) | |
| 61 (file (file-name-nondirectory FILE)) | |
| 62 all-completions) | |
| 63 ;; Make list of completions in each directory on SEARCH-PATH | |
| 64 (while SEARCH-PATH | |
| 65 (let* ((dir (concat (file-name-as-directory | |
| 66 (expand-file-name (car SEARCH-PATH))) | |
| 67 subdir)) | |
| 68 (dir-prefix (if FULL dir subdir))) | |
| 69 (if (file-directory-p dir) | |
| 70 (let ((subdir-completions | |
| 71 (file-name-all-completions file dir))) | |
| 72 (while subdir-completions | |
| 73 (setq all-completions | |
| 74 (cons (concat dir-prefix (car subdir-completions)) | |
| 75 all-completions)) | |
| 76 (setq subdir-completions (cdr subdir-completions)))))) | |
| 77 (setq SEARCH-PATH (cdr SEARCH-PATH))) | |
| 78 (if FAST all-completions | |
| 79 (let ((sorted (nreverse (sort all-completions 'string<))) | |
| 80 compressed) | |
| 81 (while sorted | |
| 82 (if (equal (car sorted) (car compressed)) nil | |
| 83 (setq compressed (cons (car sorted) compressed))) | |
| 84 (setq sorted (cdr sorted))) | |
| 85 compressed))))) | |
| 86 | |
| 87 ;;=== Utilities =========================================================== | |
| 88 | |
| 89 (defmacro progn-with-message (message &rest forms) | |
| 90 "(progn-with-message MESSAGE FORMS ...) | |
| 91 Display MESSAGE and evaluate FORMS, returning value of the last one." | |
| 92 ;; based on Hallvard Furuseth's funcall-with-message | |
| 93 `(if (eq (selected-window) (minibuffer-window)) | |
| 94 (save-excursion | |
| 95 (goto-char (point-max)) | |
| 96 (let ((orig-pmax (point-max))) | |
| 97 (unwind-protect | |
| 98 (progn | |
| 99 (insert " " ,message) (goto-char orig-pmax) | |
| 100 (sit-for 0) ; Redisplay | |
| 101 ,@forms) | |
| 102 (delete-region orig-pmax (point-max))))) | |
| 103 (prog2 | |
| 104 (message "%s" ,message) | |
| 105 (progn ,@forms) | |
| 106 (message "")))) | |
| 107 | |
| 108 (put 'progn-with-message 'lisp-indent-hook 1) | |
| 109 | |
| 110 ;;=== Completion caching ================================================== | |
| 111 | |
| 112 (defconst lib-complete:cache nil | |
| 444 | 113 "Used within `read-library' and `read-library-internal' to prevent |
| 114 costly repeated calls to `library-all-completions'. | |
| 428 | 115 Format is a list of lists of the form |
| 116 | |
| 117 ([<path> <subdir>] <cache-record> <cache-record> ...) | |
| 118 | |
| 119 where each <cache-record> has the form | |
| 120 | |
| 121 (<root> <modtimes> <completion-table>)") | |
| 122 | |
| 123 (defun lib-complete:better-root (ROOT1 ROOT2) | |
| 124 "Return non-nil if ROOT1 is a superset of ROOT2." | |
| 125 (and (equal (file-name-directory ROOT1) (file-name-directory ROOT2)) | |
| 126 (string-match | |
| 127 (concat "^" (regexp-quote (file-name-nondirectory ROOT1))) | |
| 128 ROOT2))) | |
| 129 | |
| 130 (defun lib-complete:get-completion-table (FILE PATH FILTER) | |
| 131 (let* ((subdir (file-name-directory FILE)) | |
| 132 (root (file-name-nondirectory FILE)) | |
| 133 (PATH | |
| 134 (mapcar | |
| 135 (function (lambda (dir) (file-name-as-directory | |
| 136 (expand-file-name (or dir ""))))) | |
| 137 PATH)) | |
| 138 (key (vector PATH subdir FILTER)) | |
| 139 (real-dirs | |
| 140 (if subdir | |
| 141 (mapcar (function (lambda (dir) (concat dir subdir))) PATH) | |
| 142 PATH)) | |
| 143 (path-modtimes | |
| 144 (mapcar | |
| 145 (function (lambda (fn) (if fn (nth 5 (file-attributes fn))))) | |
| 146 real-dirs)) | |
| 147 (cache-entry (assoc key lib-complete:cache)) | |
| 148 (cache-records (cdr cache-entry))) | |
| 149 ;; Look for cached entry | |
| 150 (catch 'table | |
| 151 (while cache-records | |
| 152 (if (and | |
| 153 (lib-complete:better-root (nth 0 (car cache-records)) root) | |
| 154 (equal (nth 1 (car cache-records)) path-modtimes)) | |
| 155 (throw 'table (nth 2 (car cache-records)))) | |
| 156 (setq cache-records (cdr cache-records))) | |
| 157 ;; Otherwise build completions | |
| 158 (let ((completion-list | |
| 159 (progn-with-message "(building completion table...)" | |
| 160 (library-all-completions FILE PATH nil 'fast))) | |
| 161 (completion-table (make-vector 127 0))) | |
| 162 (while completion-list | |
| 163 (let ((completion | |
| 164 (if (or (not FILTER) | |
| 165 (file-directory-p (car completion-list))) | |
| 166 (car completion-list) | |
| 167 (funcall FILTER (car completion-list))))) | |
| 168 (if completion | |
| 169 (intern completion completion-table))) | |
| 170 (setq completion-list (cdr completion-list))) | |
| 171 ;; Cache the completions | |
| 172 (lib-complete:cache-completions key root | |
| 173 path-modtimes completion-table) | |
| 174 completion-table)))) | |
| 175 | |
| 176 (defvar lib-complete:max-cache-size 40 | |
| 177 "*Maximum number of search paths which are cached.") | |
| 178 | |
| 179 (defun lib-complete:cache-completions (key root modtimes table) | |
| 180 (let* ((cache-entry (assoc key lib-complete:cache)) | |
| 181 (cache-records (cdr cache-entry)) | |
| 182 (new-cache-records (list (list root modtimes table)))) | |
| 183 (if (not cache-entry) nil | |
| 184 ;; Remove old cache entry | |
| 185 (setq lib-complete:cache (delq cache-entry lib-complete:cache)) | |
| 186 ;; Copy non-redundant entries from old cache entry | |
| 187 (while cache-records | |
| 188 (if (or (equal root (nth 0 (car cache-records))) | |
| 189 (lib-complete:better-root root (nth 0 (car cache-records)))) | |
| 190 nil | |
| 191 (setq new-cache-records | |
| 192 (cons (car cache-records) new-cache-records))) | |
| 193 (setq cache-records (cdr cache-records)))) | |
| 194 ;; Add entry to front of cache | |
| 195 (setq lib-complete:cache | |
| 196 (cons (cons key (nreverse new-cache-records)) lib-complete:cache)) | |
| 197 ;; Trim cache | |
| 198 (let ((tail (nthcdr lib-complete:max-cache-size lib-complete:cache))) | |
| 199 (if tail (setcdr tail nil))))) | |
| 200 | |
| 201 ;;=== Read a filename, with completion in a search path =================== | |
| 202 | |
| 203 (defun read-library-internal (FILE FILTER FLAG) | |
| 204 "Don't call this." | |
| 205 ;; Relies on read-library-internal-search-path being let-bound | |
| 502 | 206 (declare (special read-library-internal-search-path)) |
| 428 | 207 (let ((completion-table |
| 208 (lib-complete:get-completion-table | |
| 209 FILE read-library-internal-search-path FILTER))) | |
| 210 (cond | |
| 211 ((not completion-table) nil) | |
| 212 ;; Completion table is filtered before use, so the PREDICATE | |
| 213 ;; argument is redundant. | |
| 214 ((eq FLAG nil) (try-completion FILE completion-table nil)) | |
| 215 ((eq FLAG t) (all-completions FILE completion-table nil)) | |
| 216 ((eq FLAG 'lambda) (and (intern-soft FILE completion-table) t)) | |
| 217 ))) | |
| 218 | |
| 219 (defun read-library (PROMPT SEARCH-PATH &optional DEFAULT MUST-MATCH | |
| 220 FULL FILTER) | |
| 221 "Read library name, prompting with PROMPT and completing in directories | |
| 222 from SEARCH-PATH. A nil in the search path represents the current | |
| 223 directory. Completions for a given search-path are cached, with the | |
| 224 cache being invalidated whenever one of the directories on the path changes. | |
| 225 Default to DEFAULT if user enters a null string. | |
| 226 Optional fourth arg MUST-MATCH non-nil means require existing file's name. | |
| 227 Non-nil and non-t means also require confirmation after completion. | |
| 228 Optional fifth argument FULL non-nil causes a full pathname, rather than a | |
| 229 relative pathname, to be returned. Note that FULL implies MUST-MATCH. | |
| 230 Optional sixth argument FILTER can be used to provide a function to | |
| 231 filter the completions. This function is passed the filename, and should | |
| 232 return a transformed filename (possibly a null transformation) or nil, | |
| 233 indicating that the filename should not be included in the completions." | |
| 502 | 234 (declare (special read-library-internal-search-path)) |
| 428 | 235 (let* ((read-library-internal-search-path SEARCH-PATH) |
| 236 (library (completing-read PROMPT 'read-library-internal | |
| 237 FILTER (or MUST-MATCH FULL) nil))) | |
| 238 (cond | |
| 239 ((equal library "") DEFAULT) | |
| 240 (FULL (locate-file library read-library-internal-search-path | |
| 241 '(".el" ".el.gz" ".elc"))) | |
| 242 (t library)))) | |
| 243 | |
| 244 (defun read-library-name (prompt) | |
| 502 | 245 "PROMPTs for and returns an existing Elisp library name (without any suffix) |
| 246 or the empty string." | |
| 428 | 247 (interactive) |
| 502 | 248 (declare (special read-library-internal-search-path)) |
| 428 | 249 (let ((read-library-internal-search-path load-path)) |
| 250 (completing-read prompt | |
| 251 'read-library-internal | |
| 252 (lambda (fn) | |
| 253 (cond | |
| 254 ((string-match "\\.el\\(\\.gz\\|\\.Z\\)?$" fn) | |
| 255 (substring fn 0 (match-beginning 0))))) | |
| 256 t nil))) | |
| 257 | |
| 258 ;; NOTE: as a special case, read-library may be used to read a filename | |
| 259 ;; relative to the current directory, returning a *relative* pathname | |
| 260 ;; (read-file-name returns a full pathname). | |
| 261 ;; | |
| 262 ;; eg. (read-library "Local header: " '(nil) nil) | |
| 263 | |
| 264 ;;=== Replacement for load-library with completion ======================== | |
| 265 | |
| 266 (defun load-library (library) | |
| 267 "Load the library named LIBRARY. | |
| 268 This is an interface to the function `load'." | |
| 269 (interactive | |
| 270 (list (read-library "Load library: " load-path nil nil nil | |
| 271 (function (lambda (fn) | |
| 272 (cond | |
| 273 ((string-match "\\.elc?$" fn) | |
| 274 (substring fn 0 (match-beginning 0)))))) | |
| 275 ))) | |
| 276 (load library)) | |
| 277 | |
| 278 ;;=== find-library with completion (Author: Bob Weiner) =================== | |
| 279 | |
| 1123 | 280 ;; should be called find-lisp-source-path! |
| 531 | 281 (defcustom find-library-source-path nil |
| 282 "The default list of directories where find-library searches. | |
| 283 | |
| 284 If this variable is `nil' then find-library searches `load-path' by | |
| 285 default. | |
| 286 | |
| 1123 | 287 If this is set to a function, it will be called the first time this value |
| 288 is needed, to compute the actual list, which will then be substituted into | |
| 289 the variable. | |
| 290 | |
| 531 | 291 A good way to set this variable is like this: |
| 292 | |
| 293 \(setq find-library-source-path | |
| 1123 | 294 #'(lambda () |
| 295 (paths-find-recursive-load-path | |
| 296 (list lisp-directory \"/src/xemacs/xemacs-packages-src/\")))) | |
| 531 | 297 " |
| 298 :type '(repeat directory) | |
| 299 :group 'find-function) | |
| 300 | |
| 428 | 301 (defun find-library (library &optional codesys display-function) |
| 302 "Find and display in the current window the source for the Elisp LIBRARY. | |
| 303 LIBRARY should be a name without any path information and may include or omit | |
| 304 the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS | |
| 305 specifies the coding system to use when decoding the file. Interactively, | |
| 306 with a prefix argument, this prompts for the coding system. Optional third | |
| 307 argument DISPLAY-FUNCTION must take two arguments, the filename to display | |
| 531 | 308 and CODESYS. The default for DISPLAY-FUNCTION is `find-file'. |
| 309 | |
| 310 This function searches `find-library-source-path' to find the library; | |
| 311 if this is nil (the default), then `load-path' is searched." | |
| 428 | 312 (interactive |
| 313 (list (read-library-name "Find library: ") | |
| 314 (if current-prefix-arg | |
| 315 (read-coding-system "Coding System: ")))) | |
| 316 (let ((path (if (or (null library) (equal library "")) | |
| 317 nil | |
| 1123 | 318 (when (functionp find-library-source-path) |
| 319 (message "Computing find-library-source-path...") | |
| 320 (setq find-library-source-path | |
| 321 (funcall find-library-source-path)) | |
| 322 (message "Computing find-library-source-path... done.")) | |
| 531 | 323 (locate-file library (or find-library-source-path load-path) |
| 953 | 324 ":.el:.el.gz:.el.Z:.elc")))) |
| 428 | 325 (if path (funcall (if (fboundp display-function) |
| 326 display-function 'find-file) | |
| 327 path codesys) | |
| 328 (error "(find-library): Cannot locate library `%s'" library)))) | |
| 329 | |
| 330 (defun find-library-other-window (library &optional codesys) | |
| 331 "Find and display in another window the source for the Elisp LIBRARY. | |
| 332 LIBRARY should be a name without any path information and may include or omit | |
| 333 the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS | |
| 334 specifies the coding system to use when decoding the file. Interactively, | |
| 335 with a prefix argument, this prompts for the coding system." | |
| 336 (interactive | |
| 337 (list (read-library-name "Find library in other window: ") | |
| 338 (if current-prefix-arg | |
| 339 (read-coding-system "Coding System: ")))) | |
| 340 (find-library library codesys 'find-file-other-window)) | |
| 341 | |
| 342 (defun find-library-other-frame (library &optional codesys) | |
| 343 "Find and display in another frame the source for the Elisp LIBRARY. | |
| 344 LIBRARY should be a name without any path information and may include or omit | |
| 345 the \".el\" suffix. Under XEmacs/Mule, the optional second argument CODESYS | |
| 346 specifies the coding system to use when decoding the file. Interactively, | |
| 347 with a prefix argument, this prompts for the coding system." | |
| 348 (interactive | |
| 349 (list (read-library-name "Find library in other frame: ") | |
| 350 (if current-prefix-arg | |
| 351 (read-coding-system "Coding System: ")))) | |
| 352 (find-library library codesys 'find-file-other-frame)) | |
| 353 | |
| 354 ;; This conflicts with an existing binding. | |
| 355 ;;(define-key global-map "\C-xl" 'find-library) | |
| 356 (define-key global-map "\C-x4l" 'find-library-other-window) | |
| 357 (define-key global-map "\C-x5l" 'find-library-other-frame) | |
| 358 | |
| 359 (provide 'lib-complete) | |
| 360 | |
| 361 ;;; lib-complete.el ends here |