Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100933. ------------------------------------------------------------ revno: 100933 committer: Dan Nicolaescu branch nick: trunk timestamp: Wed 2010-07-28 23:12:38 -0700 message: * src/vm-limit.c: Do not include sys/resource.h, mem-limits.h does it. Remove reference to __osf__, unused. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-29 05:58:58 +0000 +++ src/ChangeLog 2010-07-29 06:12:38 +0000 @@ -1,5 +1,8 @@ 2010-07-29 Dan Nicolaescu + * vm-limit.c: Do not include sys/resource.h, mem-limits.h does it. + Remove reference to __osf__, unused. + * mem-limits.h: Remove duplicated includes. (NULL): Remove definition, unused. (POINTER): Remove definition. === modified file 'src/vm-limit.c' --- src/vm-limit.c 2010-07-25 14:13:30 +0000 +++ src/vm-limit.c 2010-07-29 06:12:38 +0000 @@ -25,10 +25,6 @@ #include "mem-limits.h" -#ifdef HAVE_GETRLIMIT -#include -#endif - /* Level number of warnings already issued. 0 -- no warnings issued. @@ -100,7 +96,7 @@ } #else -#if !defined (BSD4_2) && !defined (__osf__) && !defined (CYGWIN) +#if !defined (BSD4_2) && !defined (CYGWIN) #ifdef MSDOS void @@ -148,7 +144,7 @@ } #endif /* not MSDOS */ -#else /* BSD4_2 */ +#else /* BSD4_2 || CYGWIN */ static void get_lim_data (void) ------------------------------------------------------------ revno: 100932 committer: Dan Nicolaescu branch nick: trunk timestamp: Wed 2010-07-28 22:58:58 -0700 message: * src/mem-limits.h: Remove duplicated includes. (NULL): Remove definition, unused. (POINTER): Remove definition. (start_of_data): Use char* in prototype, as the function definition does. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-29 05:48:06 +0000 +++ src/ChangeLog 2010-07-29 05:58:58 +0000 @@ -1,5 +1,11 @@ 2010-07-29 Dan Nicolaescu + * mem-limits.h: Remove duplicated includes. + (NULL): Remove definition, unused. + (POINTER): Remove definition. + (start_of_data): Use char* in prototype, as the function + definition does. + Remove extern declarations from .c files, and them to .h files. * keyboard.h (Qhelp_echo, waiting_for_input) (input_available_clear_time, ignore_mouse_drag_p) === modified file 'src/mem-limits.h' --- src/mem-limits.h 2010-07-25 13:46:48 +0000 +++ src/mem-limits.h 2010-07-29 05:58:58 +0000 @@ -34,24 +34,9 @@ # endif #endif -#ifdef BSD4_2 -#include -#include -#endif /* BSD4_2 */ - -/* The important properties of this type are that 1) it's a pointer, and - 2) arithmetic on it should work as if the size of the object pointed - to has a size of 1. */ -typedef POINTER_TYPE *POINTER; - typedef unsigned long SIZE; -#ifdef NULL -#undef NULL -#endif -#define NULL ((POINTER) 0) - -extern POINTER start_of_data (void); +extern char *start_of_data (void); #if defined USE_LSB_TAG #define EXCEEDS_LISP_PTR(ptr) 0 #elif defined DATA_SEG_BITS ------------------------------------------------------------ revno: 100931 committer: Dan Nicolaescu branch nick: trunk timestamp: Wed 2010-07-28 22:48:06 -0700 message: 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. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-29 03:25:08 +0000 +++ src/ChangeLog 2010-07-29 05:48:06 +0000 @@ -1,5 +1,78 @@ 2010-07-29 Dan Nicolaescu + Remove extern declarations from .c files, and them to .h files. + * keyboard.h (Qhelp_echo, waiting_for_input) + (input_available_clear_time, ignore_mouse_drag_p) + (Vdouble_click_time, real_this_command, Vthis_original_command): + * keymap.h (Qremap, Qmenu_item, Voverriding_local_map) + (Voverriding_local_map_menu_flag): + * 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): + * xterm.h (gray_bitmap_width, gray_bitmap_height) + (gray_bitmap_bits, xic_create_fontsetname): + * coding.h (Vtranslation_table_for_input): Add extern declarations. + + * xsmfns.c (Vuser_login_name): + * xrdb.c (Vdouble_click_time): + * xfaces.c (xic_create_fontsetname): + * w32select.c (waiting_for_input): + * print.c (minibuffer_auto_raise): + * msdos.c (Qhelp_echo): + * macros.c (real_this_command): + * keymap.c (Voverriding_local_map): + * xterm.c (poll_for_input_1, gray_bitmap_width) + (gray_bitmap_height, gray_bitmap_bits; + * xmenu.c ( Voverriding_local_map) + (Voverriding_local_map_menu_flag; Qmenu_item; use_dialog_box) + (use_file_dialog, Xt_app_con): + * 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): + * minibuf.c (Voverriding_local_map, Qfield, Qfront_sticky) + (Qrear_nonsticky, nconc2): + * keyboard.c (current_global_map, minibuf_level, Qmenu_item) + (Vhistory_length, Vtranslation_table_for_input, Qcomposition) + (Qdisplay, Qafter_string, Qbefore_string, Qundefined): + * fileio.c (use_dialog_box, use_file_dialog, Vuser_login_name) + (minibuf_level, minibuffer_auto_raise, lisp_time_argument): + * eval.c (Qinteractive_form, Qrisky_local_variable, Qfunction) + (gc_in_progress): + * doc.c (Voverriding_local_map, Qremap): + * dired.c (completion_ignore_case, Qcompletion_ignore_case) + (Vcompletion_regexp_list): + * coding.c (Qmac, Qinsert_file_contents, Qwrite_region) + (Qcompletion_ignore_case): + * callint.c (Qcursor_in_echo_area, Qfile_directory_p, Qonly) + (Vhistory_length, Vthis_original_command, real_this_command) + (Qface, Qminibuffer_prompt, history_delete_duplicates): + * image.c (Qrisky_local_variable): + * fontset.c (QCname): + * fns.c (minibuffer_auto_raise, QCname): + * dispnew.c (char_ins_del_cost): + * composite.c (font_fill_lglyph_metrics): + * cmds.c (Qface, Vtranslation_table_for_input): + * charset.c (map_char_table_for_charset, Qfile_name_handler_alist): + * ccl.c (charset_unicode): + * callproc.c (Vtemporary_file_directory): + * buffer.c (emacs_strerror): Remove extern declarations. + + * data.c (Qwindow): Make non-static, used from other files too. + * frame.c (validate_x_resource_name): Remove shadow definition for i. + * unexec.c (make_hdr): Remove references to NO_REMAP, COFF, SEGMENT_MASK, SECTION_ALIGNMENT, ADJUST_EXEC_HEADER. * s/usg5-4.h (COFF): === modified file 'src/buffer.c' --- src/buffer.c 2010-07-27 03:52:35 +0000 +++ src/buffer.c 2010-07-29 05:48:06 +0000 @@ -174,8 +174,6 @@ static void modify_overlay (struct buffer *, EMACS_INT, EMACS_INT); static Lisp_Object buffer_lisp_local_variables (struct buffer *); -extern char * emacs_strerror (int); - /* For debugging; temporary. See set_buffer_internal. */ /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ === modified file 'src/callint.c' --- src/callint.c 2010-07-11 10:31:10 +0000 +++ src/callint.c 2010-07-29 05:48:06 +0000 @@ -29,21 +29,12 @@ #include "window.h" #include "keymap.h" -extern Lisp_Object Qcursor_in_echo_area; -extern Lisp_Object Qfile_directory_p; -extern Lisp_Object Qonly; - Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus; Lisp_Object Qcall_interactively; Lisp_Object Vcommand_history; -extern Lisp_Object Vhistory_length; -extern Lisp_Object Vthis_original_command, real_this_command; -extern int history_delete_duplicates; - Lisp_Object Vcommand_debug_status, Qcommand_debug_status; Lisp_Object Qenable_recursive_minibuffers; -extern Lisp_Object Qface, Qminibuffer_prompt; /* Non-nil means treat the mark as active even if mark_active is 0. */ === modified file 'src/callproc.c' --- src/callproc.c 2010-07-25 18:36:37 +0000 +++ src/callproc.c 2010-07-29 05:48:06 +0000 @@ -102,8 +102,6 @@ /* Pattern used by call-process-region to make temp files. */ static Lisp_Object Vtemp_file_name_pattern; -extern Lisp_Object Vtemporary_file_directory; - Lisp_Object Vshell_file_name; Lisp_Object Vprocess_environment, Vinitial_environment; === modified file 'src/ccl.c' --- src/ccl.c 2010-07-12 16:32:53 +0000 +++ src/ccl.c 2010-07-29 05:48:06 +0000 @@ -72,8 +72,6 @@ #define GET_HASH_TABLE(id) \ (XHASH_TABLE (XCDR(XVECTOR(Vtranslation_hash_table_vector)->contents[(id)]))) -extern int charset_unicode; - /* CCL (Code Conversion Language) is a simple language which has operations on one input buffer, one output buffer, and 7 registers. The syntax of CCL is described in `ccl.el'. Emacs Lisp function === modified file 'src/charset.c' --- src/charset.c 2010-07-27 03:52:35 +0000 +++ src/charset.c 2010-07-29 05:48:06 +0000 @@ -127,13 +127,6 @@ Lisp_Object Vcurrent_iso639_language; -/* Defined in chartab.c */ -extern void -map_char_table_for_charset (void (*c_function) (Lisp_Object, Lisp_Object), - Lisp_Object function, Lisp_Object table, - Lisp_Object arg, struct charset *charset, - unsigned from, unsigned to); - #define CODE_POINT_TO_INDEX(charset, code) \ ((charset)->code_linear_p \ ? (code) - (charset)->min_code \ @@ -472,8 +465,6 @@ return n; } -extern Lisp_Object Qfile_name_handler_alist; - /* Return a mapping vector for CHARSET loaded from MAPFILE. Each line of MAPFILE has this form 0xAAAA 0xCCCC === modified file 'src/cmds.c' --- src/cmds.c 2010-07-24 15:21:56 +0000 +++ src/cmds.c 2010-07-29 05:48:06 +0000 @@ -43,9 +43,6 @@ /* This is the command that set up Vself_insert_face. */ Lisp_Object Vself_insert_face_command; -extern Lisp_Object Qface; -extern Lisp_Object Vtranslation_table_for_input; - static int internal_self_insert (int, int); DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0, === modified file 'src/coding.c' --- src/coding.c 2010-07-12 16:32:53 +0000 +++ src/coding.c 2010-07-29 05:48:06 +0000 @@ -303,7 +303,6 @@ Lisp_Object Qcoding_system, Qcoding_aliases, Qeol_type; Lisp_Object Qunix, Qdos; -extern Lisp_Object Qmac; /* frame.c */ Lisp_Object Qbuffer_file_coding_system; Lisp_Object Qpost_read_conversion, Qpre_write_conversion; Lisp_Object Qdefault_char; @@ -317,7 +316,6 @@ Lisp_Object QCpost_read_conversion, QCpre_write_conversion; Lisp_Object QCascii_compatible_p; -extern Lisp_Object Qinsert_file_contents, Qwrite_region; Lisp_Object Qcall_process, Qcall_process_region; Lisp_Object Qstart_process, Qopen_network_stream; Lisp_Object Qtarget_idx; @@ -325,8 +323,6 @@ Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source; Lisp_Object Qinterrupted, Qinsufficient_memory; -extern Lisp_Object Qcompletion_ignore_case; - /* If a symbol has this property, evaluate the value to define the symbol as a coding system. */ static Lisp_Object Qcoding_system_define_form; === modified file 'src/coding.h' --- src/coding.h 2010-07-02 22:18:28 +0000 +++ src/coding.h 2010-07-29 05:48:06 +0000 @@ -802,6 +802,9 @@ /* Default coding systems used for process I/O. */ extern Lisp_Object Vdefault_process_coding_system; +/* Char table for translating Quail and self-inserting input. */ +extern Lisp_Object Vtranslation_table_for_input; + /* Function to call to force a user to force select a propert coding system. */ extern Lisp_Object Vselect_safe_coding_system_function; === modified file 'src/composite.c' --- src/composite.c 2010-07-27 03:52:35 +0000 +++ src/composite.c 2010-07-29 05:48:06 +0000 @@ -848,8 +848,6 @@ return header; } -extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object); - static void fill_gstring_body (Lisp_Object gstring) { === modified file 'src/data.c' --- src/data.c 2010-07-27 03:52:35 +0000 +++ src/data.c 2010-07-29 05:48:06 +0000 @@ -82,7 +82,8 @@ Lisp_Object Qinteger; static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; -static Lisp_Object Qfloat, Qwindow_configuration, Qwindow; +Lisp_Object Qwindow; +static Lisp_Object Qfloat, Qwindow_configuration; Lisp_Object Qprocess; static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; === modified file 'src/dired.c' --- src/dired.c 2010-07-27 03:52:35 +0000 +++ src/dired.c 2010-07-29 05:48:06 +0000 @@ -102,9 +102,6 @@ #define lstat stat #endif -extern int completion_ignore_case; -extern Lisp_Object Qcompletion_ignore_case; -extern Lisp_Object Vcompletion_regexp_list; extern Lisp_Object Vw32_get_true_file_attributes; Lisp_Object Vcompletion_ignored_extensions; === modified file 'src/dispnew.c' --- src/dispnew.c 2010-07-27 03:52:35 +0000 +++ src/dispnew.c 2010-07-29 05:48:06 +0000 @@ -5030,7 +5030,6 @@ /* Char insertion/deletion cost vector, from term.c */ -extern int *char_ins_del_vector; #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))]) === modified file 'src/doc.c' --- src/doc.c 2010-07-11 10:31:10 +0000 +++ src/doc.c 2010-07-29 05:48:06 +0000 @@ -52,10 +52,6 @@ /* A list of files used to build this Emacs binary. */ static Lisp_Object Vbuild_files; -extern Lisp_Object Voverriding_local_map; - -extern Lisp_Object Qremap; - /* Buffer used for reading from documentation file. */ static char *get_doc_string_buffer; static int get_doc_string_buffer_size; === modified file 'src/eval.c' --- src/eval.c 2010-07-20 15:26:53 +0000 +++ src/eval.c 2010-07-29 05:48:06 +0000 @@ -63,7 +63,6 @@ Lisp_Object Qdebug_on_error; Lisp_Object Qdeclare; Lisp_Object Qdebug; -extern Lisp_Object Qinteractive_form; /* This holds either the symbol `run-hooks' or nil. It is nil at an early stage of startup, and when Emacs @@ -166,10 +165,6 @@ Lisp_Object Vmacro_declaration_function; -extern Lisp_Object Qrisky_local_variable; - -extern Lisp_Object Qfunction; - static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object*); static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; @@ -1634,7 +1629,6 @@ That is a special case--don't do this in other situations. */ register struct handler *allhandlers = handlerlist; Lisp_Object conditions; - extern int gc_in_progress; extern int waiting_for_input; Lisp_Object string; Lisp_Object real_error_symbol; === modified file 'src/fileio.c' --- src/fileio.c 2010-07-11 10:31:10 +0000 +++ src/fileio.c 2010-07-29 05:48:06 +0000 @@ -104,8 +104,6 @@ #endif #include "commands.h" -extern int use_dialog_box; -extern int use_file_dialog; #ifndef O_WRONLY #define O_WRONLY 1 @@ -214,16 +212,10 @@ /* Lisp function for recursively deleting directories. */ Lisp_Object Qdelete_directory; -extern Lisp_Object Vuser_login_name; - #ifdef WINDOWSNT extern Lisp_Object Vw32_get_true_file_attributes; #endif -extern int minibuf_level; - -extern int minibuffer_auto_raise; - /* These variables describe handlers that have "already" had a chance to handle the current operation. @@ -3049,7 +3041,6 @@ return value; } -extern int lisp_time_argument (Lisp_Object, time_t *, int *); DEFUN ("set-file-times", Fset_file_times, Sset_file_times, 1, 2, 0, doc: /* Set times of file FILENAME to TIME. === modified file 'src/fns.c' --- src/fns.c 2010-07-12 17:47:17 +0000 +++ src/fns.c 2010-07-29 05:48:06 +0000 @@ -61,7 +61,6 @@ questions asked by mouse commands. */ int use_file_dialog; -extern int minibuffer_auto_raise; extern Lisp_Object minibuf_window; extern Lisp_Object Vlocale_coding_system; extern int load_in_progress; === modified file 'src/fontset.c' --- src/fontset.c 2010-07-11 10:31:10 +0000 +++ src/fontset.c 2010-07-29 05:48:06 +0000 @@ -1457,7 +1457,6 @@ else if (STRINGP (font_spec)) { Lisp_Object args[2]; - extern Lisp_Object QCname; fontname = font_spec; args[0] = QCname; === modified file 'src/frame.c' --- src/frame.c 2010-07-27 03:52:35 +0000 +++ src/frame.c 2010-07-29 05:48:06 +0000 @@ -3670,7 +3670,6 @@ if (STRINGP (Vx_resource_name)) { unsigned char *p = SDATA (Vx_resource_name); - int i; len = SBYTES (Vx_resource_name); === modified file 'src/frame.h' --- src/frame.h 2010-07-26 16:57:19 +0000 +++ src/frame.h 2010-07-29 05:48:06 +0000 @@ -1063,7 +1063,6 @@ extern Lisp_Object Qleft_fringe, Qright_fringe; extern Lisp_Object Qheight, Qwidth; extern Lisp_Object Qminibuffer, Qmodeline; -extern Lisp_Object Qonly; extern Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; extern Lisp_Object Qvisible; extern Lisp_Object Qdisplay_type; === modified file 'src/image.c' --- src/image.c 2010-07-27 03:52:35 +0000 +++ src/image.c 2010-07-29 05:48:06 +0000 @@ -8130,8 +8130,6 @@ void syms_of_image (void) { - extern Lisp_Object Qrisky_local_variable; /* Syms_of_xdisp has already run. */ - /* Initialize this only once, since that's what we do with Vimage_types and they are supposed to be in sync. Initializing here gives correct operation on GNU/Linux of calling dump-emacs after loading some images. */ === modified file 'src/keyboard.c' --- src/keyboard.c 2010-07-26 17:11:43 +0000 +++ src/keyboard.c 2010-07-29 05:48:06 +0000 @@ -246,9 +246,6 @@ ASCII character. */ int quit_char; -extern Lisp_Object current_global_map; -extern int minibuf_level; - /* If non-nil, this is a map that overrides all other local maps. */ Lisp_Object Voverriding_local_map; @@ -497,7 +494,6 @@ Lisp_Object Qmenu_enable; Lisp_Object QCenable, QCvisible, QChelp, QCfilter, QCkeys, QCkey_sequence; Lisp_Object QCbutton, QCtoggle, QCradio, QClabel; -extern Lisp_Object Qmenu_item; /* An event header symbol HEAD may have a property named Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); @@ -526,8 +522,6 @@ Lisp_Object Qextended_command_history; EMACS_TIME timer_check (int do_it_now); -extern Lisp_Object Vhistory_length, Vtranslation_table_for_input; - static void record_menu_key (Lisp_Object c); static int echo_length (void); @@ -1836,14 +1830,11 @@ } } -extern Lisp_Object Qcomposition, Qdisplay; - /* Adjust point to a boundary of a region that has such a property that should be treated intangible. For the moment, we check `composition', `display' and `invisible' properties. LAST_PT is the last position of point. */ -extern Lisp_Object Qafter_string, Qbefore_string; extern Lisp_Object get_pos_property (Lisp_Object, Lisp_Object, Lisp_Object); static void @@ -8116,7 +8107,6 @@ process_tool_bar_item (Lisp_Object key, Lisp_Object def, Lisp_Object data, void *args) { int i; - extern Lisp_Object Qundefined; struct gcpro gcpro1, gcpro2; /* Protect KEY and DEF from GC because parse_tool_bar_item may call === modified file 'src/keyboard.h' --- src/keyboard.h 2010-07-27 03:52:35 +0000 +++ src/keyboard.h 2010-07-29 05:48:06 +0000 @@ -422,6 +422,8 @@ extern Lisp_Object Qfunction_key, Qmouse_click, Qmouse_movement; extern Lisp_Object Qscroll_bar_movement; +extern Lisp_Object Qhelp_echo; + /* Getting the kind of an event head. */ #define EVENT_HEAD_KIND(event_head) \ (Fget ((event_head), Qevent_kind)) @@ -429,6 +431,17 @@ /* Symbols to use for non-text mouse positions. */ extern Lisp_Object Qmode_line, Qvertical_line, Qheader_line; +/* True while doing kbd input. */ +extern int waiting_for_input; + +/* Address (if not 0) of EMACS_TIME to zero out if a SIGIO interrupt + happens. */ +extern EMACS_TIME *input_available_clear_time; + +extern int ignore_mouse_drag_p; + +extern Lisp_Object Vdouble_click_time; + /* Forward declaration for prototypes. */ struct input_event; @@ -445,6 +458,13 @@ /* Keymap of key translations that can override keymaps. */ extern Lisp_Object Vkey_translation_map; +/* This is like Vthis_command, except that commands never set it. */ +extern Lisp_Object real_this_command; + +/* If the lookup of the command returns a binding, the original + command is stored in this-original-command. It is nil otherwise. */ +extern Lisp_Object Vthis_original_command; + extern int parse_menu_item (Lisp_Object, int); extern void echo_now (void); === modified file 'src/keymap.c' --- src/keymap.c 2010-07-12 17:47:17 +0000 +++ src/keymap.c 2010-07-29 05:48:06 +0000 @@ -108,8 +108,6 @@ character. */ extern Lisp_Object meta_prefix_char; -extern Lisp_Object Voverriding_local_map; - /* Hash table used to cache a reverse-map to speed up calls to where-is. */ static Lisp_Object where_is_cache; /* Which keymaps are reverse-stored in the cache. */ === modified file 'src/keymap.h' --- src/keymap.h 2010-07-02 09:26:33 +0000 +++ src/keymap.h 2010-07-29 05:48:06 +0000 @@ -22,6 +22,10 @@ #define KEYMAPP(m) (!NILP (get_keymap (m, 0, 0))) extern Lisp_Object Qkeymap, Qmenu_bar; +extern Lisp_Object Qremap; +extern Lisp_Object Qmenu_item; +extern Lisp_Object Voverriding_local_map; +extern Lisp_Object Voverriding_local_map_menu_flag; extern Lisp_Object current_global_map; EXFUN (Fmake_sparse_keymap, 1); EXFUN (Fkeymap_prompt, 1); === modified file 'src/lisp.h' --- src/lisp.h 2010-07-28 17:34:51 +0000 +++ src/lisp.h 2010-07-29 05:48:06 +0000 @@ -2269,6 +2269,7 @@ extern Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; extern Lisp_Object Qtext_read_only; +extern Lisp_Object Qinteractive_form; extern Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; @@ -2449,9 +2450,11 @@ /* Defined in fns.c */ extern int use_dialog_box; +extern int use_file_dialog; extern int next_almost_prime (int); extern Lisp_Object larger_vector (Lisp_Object, int, Lisp_Object); extern void sweep_weak_hash_tables (void); +extern Lisp_Object Qcursor_in_echo_area; extern Lisp_Object Qstring_lessp; extern Lisp_Object Vfeatures; extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq; @@ -2558,6 +2561,9 @@ extern void init_fringe_once (void); /* Defined in image.c */ +extern Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data; +extern Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; +extern Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; EXFUN (Finit_image_library, 2); extern void syms_of_image (void); extern void init_image (void); @@ -2635,6 +2641,7 @@ extern Lisp_Object Qspace, Qcenter, QCalign_to; extern Lisp_Object Vmessage_log_max; extern Lisp_Object QCdata, QCfile; +extern Lisp_Object Qrisky_local_variable; extern int message_enable_multibyte; extern Lisp_Object echo_area_buffer[2]; extern void add_to_log (const char *, Lisp_Object, Lisp_Object); @@ -2774,10 +2781,15 @@ extern void map_char_table (void (*) (Lisp_Object, Lisp_Object, Lisp_Object), Lisp_Object, Lisp_Object, Lisp_Object); +extern void map_char_table_for_charset (void (*c_function) (Lisp_Object, Lisp_Object), + Lisp_Object, Lisp_Object, + Lisp_Object, struct charset *, + unsigned, unsigned); extern void syms_of_chartab (void); /* Defined in print.c */ extern Lisp_Object Vprin1_to_string_buffer; +extern Lisp_Object Vprint_level; extern void debug_print (Lisp_Object); EXFUN (Fprin1, 2); EXFUN (Fprin1_to_string, 2); @@ -2804,6 +2816,7 @@ /* Defined in lread.c */ extern Lisp_Object Qvariable_documentation, Qstandard_input; +extern Lisp_Object Qfunction; extern Lisp_Object Vobarray, initial_obarray, Vstandard_input; EXFUN (Fread, 1); EXFUN (Fread_from_string, 3); @@ -2845,6 +2858,7 @@ extern Lisp_Object Vdebug_on_error; extern Lisp_Object Vsignaling_function; extern int handling_signal; +extern int debug_on_next_call; extern int interactive_p (int); /* To run a normal hook, use the appropriate function from the list below. @@ -2925,6 +2939,9 @@ extern void syms_of_eval (void); /* Defined in editfns.c */ +extern Lisp_Object Qfield; +extern Lisp_Object Vinhibit_field_text_motion; +extern Lisp_Object Vuser_login_name; EXFUN (Fpropertize, MANY); EXFUN (Fcurrent_message, 0); EXFUN (Fgoto_char, 1); @@ -2971,7 +2988,6 @@ extern Lisp_Object make_buffer_string_both (int, int, int, int, int); extern void init_editfns (void); extern void syms_of_editfns (void); -extern Lisp_Object Vinhibit_field_text_motion; EXFUN (Fconstrain_to_field, 5); EXFUN (Ffield_string, 1); EXFUN (Fdelete_field, 1); @@ -2979,6 +2995,7 @@ EXFUN (Ffield_end, 3); EXFUN (Ffield_string_no_properties, 1); extern void set_time_zone_rule (const char *); +extern int lisp_time_argument (Lisp_Object, time_t *, int *); /* Defined in buffer.c */ extern int mouse_face_overlay_overlaps (Lisp_Object); @@ -3013,7 +3030,7 @@ EXFUN (Fbuffer_enable_undo, 1); EXFUN (Ferase_buffer, 0); extern Lisp_Object Qoverlayp; -extern Lisp_Object Qevaporate; +extern Lisp_Object Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string; extern Lisp_Object get_truename_buffer (Lisp_Object); extern struct buffer *all_buffers; EXFUN (Fprevious_overlay_change, 1); @@ -3045,6 +3062,8 @@ /* Defined in fileio.c */ extern Lisp_Object Qfile_error; +extern Lisp_Object Qfile_directory_p; +extern Lisp_Object Qinsert_file_contents; EXFUN (Ffind_file_name_handler, 2); EXFUN (Ffile_name_as_directory, 1); EXFUN (Fmake_temp_name, 1); @@ -3104,7 +3123,14 @@ /* Defined in minibuf.c */ +extern Lisp_Object Qcompletion_ignore_case; +extern Lisp_Object Qcompletion_ignore_case; +extern Lisp_Object Vcompletion_regexp_list; +extern Lisp_Object Vhistory_length; extern Lisp_Object last_minibuf_string; +extern int completion_ignore_case; +extern int history_delete_duplicates; +extern int minibuffer_auto_raise; extern void choose_minibuf_frame (void); EXFUN (Fcompleting_read, 8); EXFUN (Fread_from_minibuffer, 7); @@ -3206,6 +3232,7 @@ extern Lisp_Object Vx_resource_name; extern Lisp_Object Vx_resource_class; #endif /* HAVE_WINDOW_SYSTEM */ +extern Lisp_Object Qonly; extern Lisp_Object Qvisible; extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); @@ -3253,6 +3280,7 @@ extern Lisp_Object Vbefore_init_time, Vafter_init_time; extern Lisp_Object Vinstallation_directory; extern Lisp_Object empty_unibyte_string, empty_multibyte_string; +extern Lisp_Object Qfile_name_handler_alist; EXFUN (Fkill_emacs, 1) NO_RETURN; #if HAVE_SETLOCALE void fixup_locale (void); @@ -3359,6 +3387,9 @@ /* Defined in textprop.c */ extern Lisp_Object Qfont, Qmouse_face; extern Lisp_Object Qinsert_in_front_hooks, Qinsert_behind_hooks; +extern Lisp_Object Qfront_sticky, Qrear_nonsticky; +extern Lisp_Object Qminibuffer_prompt; + EXFUN (Fnext_single_property_change, 4); EXFUN (Fnext_single_char_property_change, 4); EXFUN (Fprevious_single_property_change, 4); @@ -3424,6 +3455,7 @@ #endif /* Defined in filelock.c */ +extern Lisp_Object Vtemporary_file_directory; EXFUN (Funlock_buffer, 0); EXFUN (Ffile_locked_p, 1); extern void unlock_all_files (void); @@ -3453,6 +3485,7 @@ int, Lisp_Object); /* Defined in term.c */ +extern int *char_ins_del_vector; extern void syms_of_term (void); extern void fatal (const char *msgid, ...) NO_RETURN; @@ -3478,6 +3511,7 @@ #endif /* Defined in xfaces.c */ +extern Lisp_Object Qface; extern Lisp_Object Qnormal; extern Lisp_Object QCfamily, QCweight, QCslant, QCwidth; extern Lisp_Object QCheight, QCsize, QCname, QCwidth, QCforeground, QCbackground; === modified file 'src/macros.c' --- src/macros.c 2010-07-08 21:25:08 +0000 +++ src/macros.c 2010-07-29 05:48:06 +0000 @@ -51,8 +51,6 @@ Lisp_Object executing_kbd_macro; -extern Lisp_Object real_this_command; - Lisp_Object Fexecute_kbd_macro (Lisp_Object macro, Lisp_Object count, Lisp_Object loopfunc); DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 2, "P", === modified file 'src/minibuf.c' --- src/minibuf.c 2010-07-27 03:52:35 +0000 +++ src/minibuf.c 2010-07-29 05:48:06 +0000 @@ -143,9 +143,6 @@ Lisp_Object Qread_expression_history; -extern Lisp_Object Voverriding_local_map; - -extern Lisp_Object Qfield; /* Put minibuf on currently selected frame's minibuffer. We do this whenever the user starts a new minibuffer @@ -442,9 +439,6 @@ Lisp_Object empty_minibuf; Lisp_Object dummy, frame; - extern Lisp_Object Qfront_sticky; - extern Lisp_Object Qrear_nonsticky; - specbind (Qminibuffer_default, defalt); /* If Vminibuffer_completing_file_name is `lambda' on entry, it was t @@ -822,7 +816,6 @@ { Lisp_Object tail, num, buf; char name[24]; - extern Lisp_Object nconc2 (Lisp_Object, Lisp_Object); XSETFASTINT (num, depth); tail = Fnthcdr (num, Vminibuffer_list); === modified file 'src/msdos.c' --- src/msdos.c 2010-07-27 03:52:35 +0000 +++ src/msdos.c 2010-07-29 05:48:06 +0000 @@ -1191,7 +1191,6 @@ if (row->enabled_p) { - extern Lisp_Object Qhelp_echo; struct glyph *glyph, *end; Lisp_Object help, map; === modified file 'src/print.c' --- src/print.c 2010-07-11 09:27:13 +0000 +++ src/print.c 2010-07-29 05:48:06 +0000 @@ -166,8 +166,6 @@ extern int noninteractive_need_newline; -extern int minibuffer_auto_raise; - void print_interval (INTERVAL interval, Lisp_Object printcharfun); /* GDB resets this to zero on W32 to disable OutputDebugString calls. */ === modified file 'src/w32select.c' --- src/w32select.c 2010-07-08 21:25:08 +0000 +++ src/w32select.c 2010-07-29 05:48:06 +0000 @@ -398,7 +398,6 @@ with global variables and calling strange looking functions. Is this really the right way to run Lisp callbacks? */ - extern int waiting_for_input; int owfi; BLOCK_INPUT; === modified file 'src/xdisp.c' --- src/xdisp.c 2010-07-28 17:34:51 +0000 +++ src/xdisp.c 2010-07-29 05:48:06 +0000 @@ -276,15 +276,11 @@ extern int interrupt_input; extern int command_loop_level; -extern int minibuffer_auto_raise; extern Lisp_Object Vminibuffer_list; extern Lisp_Object Qface; extern Lisp_Object Qmode_line, Qmode_line_inactive, Qheader_line; -extern Lisp_Object Voverriding_local_map; -extern Lisp_Object Voverriding_local_map_menu_flag; -extern Lisp_Object Qmenu_item; extern Lisp_Object Qwhen; extern Lisp_Object Qhelp_echo; extern Lisp_Object Qbefore_string, Qafter_string; @@ -379,7 +375,6 @@ /* Names of text properties relevant for redisplay. */ Lisp_Object Qdisplay; -extern Lisp_Object Qface, Qinvisible, Qwidth; /* Symbols used in text property values. */ @@ -3689,7 +3684,6 @@ if (STRINGP (it->string)) { - extern Lisp_Object Qinvisible; Lisp_Object prop, end_charpos, limit, charpos; /* Get the value of the invisible text property at the @@ -4873,7 +4867,6 @@ static void load_overlay_strings (struct it *it, int charpos) { - extern Lisp_Object Qwindow, Qpriority; Lisp_Object overlay, window, str, invisible; struct Lisp_Overlay *ov; int start, end; @@ -10585,7 +10578,6 @@ if ((nlines = tool_bar_lines_needed (f, &f->n_tool_bar_rows), nlines != WINDOW_TOTAL_LINES (w))) { - extern Lisp_Object Qtool_bar_lines; Lisp_Object frame; int old_height = WINDOW_TOTAL_LINES (w); @@ -10677,7 +10669,6 @@ frame parameter. */ if (change_height_p) { - extern Lisp_Object Qtool_bar_lines; Lisp_Object frame; int old_height = WINDOW_TOTAL_LINES (w); int nrows; @@ -14485,7 +14476,6 @@ if (redisplay_tool_bar_p && redisplay_tool_bar (f)) { - extern int ignore_mouse_drag_p; ignore_mouse_drag_p = 1; } } === modified file 'src/xfaces.c' --- src/xfaces.c 2010-07-27 03:52:35 +0000 +++ src/xfaces.c 2010-07-29 05:48:06 +0000 @@ -3666,8 +3666,6 @@ if (! NILP (xlfd)) { #if defined HAVE_X_I18N - extern char *xic_create_fontsetname - (char *base_fontname, Bool motif); char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif); #else char *fontsetname = (char *) SDATA (xlfd); === modified file 'src/xfns.c' --- src/xfns.c 2010-07-27 03:52:35 +0000 +++ src/xfns.c 2010-07-29 05:48:06 +0000 @@ -1901,12 +1901,12 @@ /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ -char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; +const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; /* Create an Xt fontset spec from the name of a base font. If `motif' is True use the Motif syntax. */ char * -xic_create_fontsetname (char *base_fontname, int motif) +xic_create_fontsetname (const char *base_fontname, int motif) { const char *sep = motif ? ";" : ","; char *fontsetname; @@ -1926,7 +1926,7 @@ - the base font. - the base font where the charset spec is replaced by -*-*. - the same but with the family also replaced with -*-*-. */ - char *p = base_fontname; + const char *p = base_fontname; int i; for (i = 0; *p; p++) @@ -1945,13 +1945,13 @@ else { int len; - char *p1 = NULL, *p2 = NULL, *p3 = NULL; + const char *p1 = NULL, *p2 = NULL, *p3 = NULL; char *font_allcs = NULL; char *font_allfamilies = NULL; char *font_all = NULL; - char *allcs = "*-*-*-*-*-*-*"; - char *allfamilies = "-*-*-"; - char *all = "*-*-*-*-"; + const char *allcs = "*-*-*-*-*-*-*"; + const char *allfamilies = "-*-*-"; + const char *all = "*-*-*-*-"; char *base; for (i = 0, p = base_fontname; i < 8; p++) @@ -2080,7 +2080,7 @@ char **missing_list; int missing_count; char *def_string; - char *xlfd_format = "-*-*-medium-r-normal--%d-*-*-*-*-*"; + const char *xlfd_format = "-*-*-medium-r-normal--%d-*-*-*-*-*"; sprintf (buf, xlfd_format, pixel_size); missing_list = NULL; @@ -5239,9 +5239,6 @@ (void) { #ifdef USE_GTK - extern int use_dialog_box; - extern int use_file_dialog; - if (use_dialog_box && use_file_dialog && have_menus_p () @@ -5312,7 +5309,6 @@ Widget dialog, text, help; Arg al[10]; int ac = 0; - extern XtAppContext Xt_app_con; XmString dir_xmstring, pattern_xmstring; int count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; === modified file 'src/xmenu.c' --- src/xmenu.c 2010-07-27 04:12:42 +0000 +++ src/xmenu.c 2010-07-29 05:48:06 +0000 @@ -113,9 +113,6 @@ extern Lisp_Object QCtoggle, QCradio; -extern Lisp_Object Voverriding_local_map; -extern Lisp_Object Voverriding_local_map_menu_flag; - extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; extern Lisp_Object Qmenu_bar_update_hook; @@ -2209,7 +2206,6 @@ static void menu_help_callback (char *help_string, int pane, int item) { - extern Lisp_Object Qmenu_item; Lisp_Object *first_item; Lisp_Object pane_name; Lisp_Object menu_object; === modified file 'src/xrdb.c' --- src/xrdb.c 2010-07-27 03:52:35 +0000 +++ src/xrdb.c 2010-07-29 05:48:06 +0000 @@ -508,7 +508,6 @@ #ifdef USE_MOTIF const char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; - extern Lisp_Object Vdouble_click_time; #endif x_rm_string = XrmStringToQuark (XrmStringType); === modified file 'src/xsmfns.c' --- src/xsmfns.c 2010-07-08 21:25:08 +0000 +++ src/xsmfns.c 2010-07-29 05:48:06 +0000 @@ -45,10 +45,6 @@ /* Avoid "differ in sign" warnings */ #define SSDATA(x) ((char *) SDATA (x)) -/* The user login name. */ - -extern Lisp_Object Vuser_login_name; - /* This is the event used when SAVE_SESSION_EVENT occurs. */ static struct input_event emacs_event; === modified file 'src/xterm.c' --- src/xterm.c 2010-07-27 03:52:35 +0000 +++ src/xterm.c 2010-07-29 05:48:06 +0000 @@ -9010,7 +9010,6 @@ /* It could be confusing if a real alarm arrives while processing the fake one. Turn it off and let the handler reset it. */ - extern void poll_for_input_1 (void); int old_poll_suppress_count = poll_suppress_count; poll_suppress_count = 1; poll_for_input_1 (); @@ -10139,8 +10138,6 @@ dpyinfo->connection = connection; { - extern int gray_bitmap_width, gray_bitmap_height; - extern char *gray_bitmap_bits; dpyinfo->gray = XCreatePixmapFromBitmapData (dpyinfo->display, dpyinfo->root_window, gray_bitmap_bits, === modified file 'src/xterm.h' --- src/xterm.h 2010-07-27 03:52:35 +0000 +++ src/xterm.h 2010-07-29 05:48:06 +0000 @@ -933,6 +933,8 @@ EXFUN (Fx_display_color_p, 1); EXFUN (Fx_display_grayscale_p, 1); extern void x_free_gcs (struct frame *); +extern int gray_bitmap_width, gray_bitmap_height; +extern char *gray_bitmap_bits; /* From xrdb.c. */ @@ -1053,6 +1055,7 @@ extern int x_defined_color (struct frame *, const char *, XColor *, int); #ifdef HAVE_X_I18N extern void free_frame_xic (struct frame *); +extern char * xic_create_fontsetname (const char *base_fontname, int motif); #endif extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); ------------------------------------------------------------ revno: 100930 committer: Dan Nicolaescu branch nick: trunk timestamp: Wed 2010-07-28 21:16:23 -0700 message: * lwlib/xlwmenu.c (abort_gracefully): Mark as NO_RETURN. diff: === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2010-07-26 06:22:32 +0000 +++ lwlib/ChangeLog 2010-07-29 04:16:23 +0000 @@ -1,3 +1,7 @@ +2010-07-29 Dan Nicolaescu + + * xlwmenu.c (abort_gracefully): Mark as NO_RETURN. + 2010-07-26 Dan Nicolaescu * xlwmenu.h (xlwmenu_window_p, xlwmenu_redisplay): Add declarations. === modified file 'lwlib/xlwmenu.c' --- lwlib/xlwmenu.c 2010-07-08 10:29:51 +0000 +++ lwlib/xlwmenu.c 2010-07-29 04:16:23 +0000 @@ -204,7 +204,7 @@ static void Nothing(Widget w, XEvent *ev, String *params, Cardinal *num_params); static int separator_height (enum menu_separator); static void pop_up_menu (XlwMenuWidget, XButtonPressedEvent *); - +static void abort_gracefully (Widget w) NO_RETURN; static XtActionsRec xlwMenuActionsList [] = ------------------------------------------------------------ revno: 100929 committer: Dan Nicolaescu branch nick: trunk timestamp: Wed 2010-07-28 20:41:28 -0700 message: * configure.in: Remove reference to usg5-4, unused. diff: === modified file 'ChangeLog' --- ChangeLog 2010-07-25 19:09:54 +0000 +++ ChangeLog 2010-07-29 03:41:28 +0000 @@ -1,3 +1,7 @@ +2010-07-29 Dan Nicolaescu + + * configure.in: Remove reference to usg5-4, unused. + 2010-07-25 Andreas Schwab * configure.in: Check for __executable_start. === modified file 'configure' --- configure 2010-07-25 19:09:54 +0000 +++ configure 2010-07-29 03:41:28 +0000 @@ -14149,7 +14149,7 @@ ORDINARY_LINK= case "$opsys" in ## gnu: GNU needs its own crt0. - aix4-2|cygwin|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;; + aix4-2|cygwin|darwin|gnu|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;; ## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the ## library search parth, i.e. it won't search /usr/lib for libc and === modified file 'configure.in' --- configure.in 2010-07-25 19:09:54 +0000 +++ configure.in 2010-07-29 03:41:28 +0000 @@ -3326,7 +3326,7 @@ ORDINARY_LINK= case "$opsys" in ## gnu: GNU needs its own crt0. - aix4-2|cygwin|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;; + aix4-2|cygwin|darwin|gnu|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;; ## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the ## library search parth, i.e. it won't search /usr/lib for libc and ------------------------------------------------------------ revno: 100928 committer: Dan Nicolaescu branch nick: trunk timestamp: Wed 2010-07-28 20:25:08 -0700 message: Clean up unexec.c, remove references to unused code. * nt/config.nt: Remove code referring to NO_REMAP, unused. * src/unexec.c (make_hdr): Remove references to NO_REMAP, COFF, SEGMENT_MASK, SECTION_ALIGNMENT, ADJUST_EXEC_HEADER. * src/s/usg5-4.h (COFF): * src/s/template.h: * src/s/msdos.h (COFF, NO_REMAP): * src/s/ms-w32.h (NO_REMAP): * src/s/hpux10-20.h (NO_REMAP): * src/m/sparc.h (SEGMENT_MASK): * src/m/m68k.h (NO_REMAP): * src/m/intel386.h (SEGMENT_MASK): * src/m/arm.h (NO_REMAP): * src/m/alpha.h (COFF): * src/m/template.h: Remove references to unused defines. diff: === modified file 'admin/CPP-DEFINES' --- admin/CPP-DEFINES 2010-07-11 10:31:10 +0000 +++ admin/CPP-DEFINES 2010-07-29 03:25:08 +0000 @@ -65,7 +65,6 @@ EXPLICIT_SIGN_EXTEND LOAD_AVE_CVT LOAD_AVE_TYPE -NO_REMAP VIRT_ADDR_VARIES WORDS_BIG_ENDIAN @@ -190,7 +189,6 @@ HAVE_UNISTD_H HAVE_UTIMES HAVE_UTIME_H -HAVE_VOLATILE HAVE_WINDOW_SYSTEM HAVE_WORKING_VFORK HAVE_XRMSETDATABASE @@ -237,7 +235,6 @@ PURESIZE RUN_TIME_REMAP SA_RESTART -SECTION_ALIGNMENT -- was only used by s/lynxos.h, maybe all code depending on it can be removed. SEGMENT_MASK SETPGRP_RELEASES_CTTY SETUP_SLAVE_PTY @@ -252,14 +249,12 @@ SIGTYPE SOLARIS2 STDC_HEADERS -SYMS_SYSTEM SYSTEM_PURESIZE_EXTRA SYSTEM_MALLOC SYSV_SYSTEM_DIR TAB3 TABDLY TERM -THIS_IS_CONFIGURE TIME_WITH_SYS_TIME TIOCSIGSEND TM_IN_SYS_TIME === modified file 'nt/ChangeLog' --- nt/ChangeLog 2010-07-25 03:53:37 +0000 +++ nt/ChangeLog 2010-07-29 03:25:08 +0000 @@ -1,3 +1,7 @@ +2010-07-29 Dan Nicolaescu + + * config.nt: Remove code referring to NO_REMAP, unused. + 2010-07-25 Christoph Scholtes Build binary distros on Windows using emacs-VERSION as root dir name. === modified file 'nt/config.nt' --- nt/config.nt 2010-07-12 18:16:54 +0000 +++ nt/config.nt 2010-07-29 03:25:08 +0000 @@ -308,12 +308,6 @@ #undef config_machfile #include "m/intel386.h" -/* If no remapping takes place, static variables cannot be dumped as - pure, so don't worry about the `static' keyword. */ -#ifdef NO_REMAP -#undef static -#endif - /* Define `subprocesses' should be defined if you want to have code for asynchronous subprocesses (as used in M-x compile and M-x shell). === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-29 02:42:53 +0000 +++ src/ChangeLog 2010-07-29 03:25:08 +0000 @@ -1,3 +1,19 @@ +2010-07-29 Dan Nicolaescu + + * unexec.c (make_hdr): Remove references to NO_REMAP, COFF, + SEGMENT_MASK, SECTION_ALIGNMENT, ADJUST_EXEC_HEADER. + * s/usg5-4.h (COFF): + * s/template.h: + * s/msdos.h (COFF, NO_REMAP): + * s/ms-w32.h (NO_REMAP): + * s/hpux10-20.h (NO_REMAP): + * m/sparc.h (SEGMENT_MASK): + * m/m68k.h (NO_REMAP): + * m/intel386.h (SEGMENT_MASK): + * m/arm.h (NO_REMAP): + * m/alpha.h (COFF): + * m/template.h: Remove references to unused defines. + 2010-07-28 Jan Djärv * xsettings.c (Ftool_bar_get_system_style): Also check for === modified file 'src/m/alpha.h' --- src/m/alpha.h 2010-07-08 03:03:52 +0000 +++ src/m/alpha.h 2010-07-29 03:25:08 +0000 @@ -64,12 +64,6 @@ termio and struct termios are mutually incompatible. */ #define NO_TERMIO -#if defined (GNU_LINUX) || defined (__NetBSD__) || defined (__OpenBSD__) -# ifndef __ELF__ -# define COFF -# endif /* notdef __ELF__ */ -#endif - /* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN: they generate code that uses a signaling NaN instead of DBL_MIN. Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN: === modified file 'src/m/arm.h' --- src/m/arm.h 2010-05-12 03:01:16 +0000 +++ src/m/arm.h 2010-07-29 03:25:08 +0000 @@ -22,7 +22,5 @@ is the most significant byte. */ #undef WORDS_BIG_ENDIAN -#define NO_REMAP - /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42 (do not change this comment) */ === modified file 'src/m/intel386.h' --- src/m/intel386.h 2010-07-08 03:03:52 +0000 +++ src/m/intel386.h 2010-07-29 03:25:08 +0000 @@ -32,8 +32,6 @@ /* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */ /* we cannot get the maximum address for brk */ #define ULIMIT_BREAK_VALUE (32*1024*1024) - -#define SEGMENT_MASK ((SEGMENT_SIZE)-1) #endif /* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec === modified file 'src/m/m68k.h' --- src/m/m68k.h 2010-07-08 03:03:52 +0000 +++ src/m/m68k.h 2010-07-29 03:25:08 +0000 @@ -40,7 +40,6 @@ #define DATA_SEG_BITS 0x80000000 #endif -#define NO_REMAP #endif /* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d === modified file 'src/m/sparc.h' --- src/m/sparc.h 2010-05-12 02:37:59 +0000 +++ src/m/sparc.h 2010-07-29 03:25:08 +0000 @@ -34,9 +34,6 @@ /* Convert that into an integer that is 100 for a load average of 1.0 */ #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) -/* Mask for address bits within a memory segment */ -#define SEGMENT_MASK (SEGSIZ - 1) - #ifdef __arch64__ /* GCC, 64-bit ABI. */ #define BITS_PER_LONG 64 === modified file 'src/m/template.h' --- src/m/template.h 2010-06-30 02:48:54 +0000 +++ src/m/template.h 2010-07-29 03:25:08 +0000 @@ -47,12 +47,6 @@ numerically. */ #define VIRT_ADDR_VARIES -/* Define NO_REMAP if memory segmentation makes it not work well - to change the boundary between the text section and data section - when Emacs is dumped. If you define this, the preloaded Lisp - code will not be sharable; but that's better than failing completely. */ -#define NO_REMAP - /* After adding support for a new machine, modify the large case statement in configure.in to recognize reasonable configuration names, and add a description of the system to === modified file 'src/s/hpux10-20.h' --- src/s/hpux10-20.h 2010-07-11 10:31:10 +0000 +++ src/s/hpux10-20.h 2010-07-29 03:25:08 +0000 @@ -113,12 +113,6 @@ on HP-UX. (You get duplicate symbol errors on linking). */ #undef _FILE_OFFSET_BITS -/* Define NO_REMAP if memory segmentation makes it not work well - to change the boundary between the text section and data section - when Emacs is dumped. If you define this, the preloaded Lisp - code will not be sharable; but that's better than failing completely. */ -#define NO_REMAP - /* Define VIRT_ADDR_VARIES if the virtual addresses of pure and impure space as loaded can vary, and even their relative order cannot be relied on. === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2010-07-12 16:56:59 +0000 +++ src/s/ms-w32.h 2010-07-29 03:25:08 +0000 @@ -62,10 +62,6 @@ for received packets, so datagrams are broken too. */ #define BROKEN_DATAGRAM_SOCKETS 1 -/* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ -#define COFF 1 - #define MAIL_USE_POP 1 #define MAIL_USE_SYSTEM_LOCK 1 === modified file 'src/s/msdos.h' --- src/s/msdos.h 2010-07-12 16:56:59 +0000 +++ src/s/msdos.h 2010-07-29 03:25:08 +0000 @@ -45,10 +45,6 @@ This is the only system that needs this. */ #undef subprocesses -/* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ -#define COFF - /* Here, on a separate page, add any special hacks needed to make Emacs work on this system. For example, you might define certain system call names that don't exist on your system, or that do @@ -131,7 +127,5 @@ #define GC_SETJMP_WORKS 1 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS -#define NO_REMAP - /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0 (do not change this comment) */ === modified file 'src/s/template.h' --- src/s/template.h 2010-06-30 02:48:54 +0000 +++ src/s/template.h 2010-07-29 03:25:08 +0000 @@ -85,11 +85,6 @@ /* #undef subprocesses */ -/* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ - -/* #define COFF */ - /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ === modified file 'src/s/usg5-4.h' --- src/s/usg5-4.h 2010-07-11 10:31:10 +0000 +++ src/s/usg5-4.h 2010-07-29 03:25:08 +0000 @@ -56,8 +56,6 @@ /* On USG systems signal handlers return void. */ #define SIGTYPE void -#undef COFF - /* Get FIONREAD from . Get to get struct tchars. But get first to make sure ttold.h doesn't interfere. And don't try to use SIGIO yet. */ === modified file 'src/unexec.c' --- src/unexec.c 2010-07-08 03:03:52 +0000 +++ src/unexec.c 2010-07-29 03:25:08 +0000 @@ -48,8 +48,6 @@ * * Specifying zero for data_start means the boundary between text and data * should not be the same as when the program was loaded. - * If NO_REMAP is defined, the argument data_start is ignored and the - * segment boundaries are never changed. * * Bss_start indicates how much of the data segment is to be saved in the * a.out file and restored when the program is executed. It gives the lowest @@ -69,56 +67,6 @@ * of Dell Computer Corporation. james@bigtex.cactus.org. */ -/* There are several compilation parameters affecting unexec: - -* COFF - -Define this if your system uses COFF for executables. - -* NO_REMAP - -Define this if you do not want to try to save Emacs's pure data areas -as part of the text segment. - -Saving them as text is good because it allows users to share more. - -However, on machines that locate the text area far from the data area, -the boundary cannot feasibly be moved. Such machines require -NO_REMAP. - -Also, remapping can cause trouble with the built-in startup routine -/lib/crt0.o, which defines `environ' as an initialized variable. -Dumping `environ' as pure does not work! So, to use remapping, -you must write a startup routine for your machine in Emacs's crt0.c. -If NO_REMAP is defined, Emacs uses the system's crt0.o. - -* SECTION_ALIGNMENT - -Some machines that use COFF executables require that each section -start on a certain boundary *in the COFF file*. Such machines should -define SECTION_ALIGNMENT to a mask of the low-order bits that must be -zero on such a boundary. This mask is used to control padding between -segments in the COFF file. - -If SECTION_ALIGNMENT is not defined, the segments are written -consecutively with no attempt at alignment. This is right for -unmodified system V. - -* SEGMENT_MASK - -Some machines require that the beginnings and ends of segments -*in core* be on certain boundaries. For most machines, a page -boundary is sufficient. That is the default. When a larger -boundary is needed, define SEGMENT_MASK to a mask of -the bits that must be zero on such a boundary. - -* ADJUST_EXEC_HEADER - -This macro can be used to generate statements to adjust or -initialize nonstandard fields in the file header - -*/ - #ifndef emacs #define PERROR(arg) perror (arg); return -1 #else @@ -264,19 +212,9 @@ pagemask = getpagesize () - 1; /* Adjust text/data boundary. */ -#ifdef NO_REMAP data_start = (int) start_of_data (); -#else /* not NO_REMAP */ - if (!data_start) - data_start = (int) start_of_data (); -#endif /* not NO_REMAP */ data_start = ADDR_CORRECT (data_start); - -#ifdef SEGMENT_MASK - data_start = data_start & ~SEGMENT_MASK; /* (Down) to segment boundary. */ -#else data_start = data_start & ~pagemask; /* (Down) to page boundary. */ -#endif bss_end = ADDR_CORRECT (sbrk (0)) + pagemask; bss_end &= ~ pagemask; @@ -374,42 +312,20 @@ to correspond to what we want to dump. */ f_hdr.f_flags |= (F_RELFLG | F_EXEC); -#ifndef NO_REMAP f_ohdr.text_start = (long) start_of_text (); f_ohdr.tsize = data_start - f_ohdr.text_start; f_ohdr.data_start = data_start; -#endif /* NO_REMAP */ f_ohdr.dsize = bss_start - f_ohdr.data_start; f_ohdr.bsize = bss_end - bss_start; - /* On some machines, the old values are right. - ??? Maybe on all machines with NO_REMAP. */ f_thdr.s_size = f_ohdr.tsize; f_thdr.s_scnptr = sizeof (f_hdr) + sizeof (f_ohdr); f_thdr.s_scnptr += (f_hdr.f_nscns) * (sizeof (f_thdr)); lnnoptr = f_thdr.s_lnnoptr; -#ifdef SECTION_ALIGNMENT - /* Some systems require special alignment - of the sections in the file itself. */ - f_thdr.s_scnptr - = (f_thdr.s_scnptr + SECTION_ALIGNMENT) & ~SECTION_ALIGNMENT; -#endif /* SECTION_ALIGNMENT */ text_scnptr = f_thdr.s_scnptr; f_dhdr.s_paddr = f_ohdr.data_start; f_dhdr.s_vaddr = f_ohdr.data_start; f_dhdr.s_size = f_ohdr.dsize; f_dhdr.s_scnptr = f_thdr.s_scnptr + f_thdr.s_size; -#ifdef SECTION_ALIGNMENT - /* Some systems require special alignment - of the sections in the file itself. */ - f_dhdr.s_scnptr - = (f_dhdr.s_scnptr + SECTION_ALIGNMENT) & ~SECTION_ALIGNMENT; -#endif /* SECTION_ALIGNMENT */ -#ifdef DATA_SECTION_ALIGNMENT - /* Some systems require special alignment - of the data section only. */ - f_dhdr.s_scnptr - = (f_dhdr.s_scnptr + DATA_SECTION_ALIGNMENT) & ~DATA_SECTION_ALIGNMENT; -#endif /* DATA_SECTION_ALIGNMENT */ data_scnptr = f_dhdr.s_scnptr; f_bhdr.s_paddr = f_ohdr.data_start + f_ohdr.dsize; f_bhdr.s_vaddr = f_ohdr.data_start + f_ohdr.dsize; @@ -427,10 +343,6 @@ f_thdr.s_lnnoptr += bias; } -#ifdef ADJUST_EXEC_HEADER - ADJUST_EXEC_HEADER; -#endif /* ADJUST_EXEC_HEADER */ - if (write (new, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) { PERROR (new_name); ------------------------------------------------------------ revno: 100927 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2010-07-29 04:42:53 +0200 message: Fix typos in ChangeLogs. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-07-29 02:11:23 +0000 +++ lib-src/ChangeLog 2010-07-29 02:42:53 +0000 @@ -16,7 +16,7 @@ 2010-07-24 Dan Nicolaescu - * update-game-score.c (usage): Add NO_RETURN specifier. + * update-game-score.c (usage): Add NO_RETURN specifier. * movemail.c (fatal, pfatal_with_name, pfatal_and_delete): * make-docfile.c (fatal): * hexl.c (usage): === modified file 'lisp/ChangeLog.1' --- lisp/ChangeLog.1 2010-07-24 11:53:19 +0000 +++ lisp/ChangeLog.1 2010-07-29 02:42:53 +0000 @@ -173,7 +173,7 @@ 1986-03-15 Bill Rozas (jinx@prep) - * scheme.el: (scheme-zap-name) Uses expand-file-name to obtain an + * scheme.el (scheme-zap-name): Uses expand-file-name to obtain an absolute pathname. 1986-03-15 Richard M. Stallman (rms@prep) @@ -184,7 +184,7 @@ 1986-03-13 Bill Rozas (jinx@prep) - * scheme.el: (scheme-zap-name) change it back to fromedit.zap + * scheme.el (scheme-zap-name): Change it back to fromedit.zap since that is where scheme expects it and it is too much work to change scheme right now. This interface is obsolete anyway, but some people (athena) still use it. @@ -384,7 +384,7 @@ * info.el (Info-find-node): Fix braino. Also, allow abbreviations for node names. - Info-tagify: insert tags in forward order so that + (Info-tagify): Insert tags in forward order so that an abbrev finds the textually first possibility rather than the last. @@ -570,7 +570,7 @@ 1986-01-18 Richard M. Stallman (rms@prep) - * doctor.el: Fix typo "symtoms". + * doctor.el: Fix typo "symtoms". 1986-01-10 Richard Mlynarik (mly@prep) @@ -660,7 +660,7 @@ 1985-12-27 Richard Mlynarik (mly@prep) * view.el: - Various: Fix cases of "view" => "View" which were missed. Damn. + Various: Fix cases of "view" => "View" which were missed. Damn. 1985-12-27 Richard M. Stallman (rms@prep) @@ -917,7 +917,7 @@ * files.el (normal-mode): New command to choose major mode automatically. - * inc-vers.el: Renamed from inc-version.el + * inc-vers.el: Renamed from inc-version.el for file name length reasons. * term/*.el: terminal-specific files found here now. @@ -1137,7 +1137,7 @@ 1985-11-27 Richard Mlynarik (mly@prep) - * rnews.el: (news-mode, news-set-mode-line): + * rnews.el (news-mode, news-set-mode-line): Get rid of news-mode-group-string. * rnews.el (news-unsubscribe-internal): @@ -1614,7 +1614,7 @@ 1985-10-17 Richard Mlynarik (mly@mit-prep) - * rnews.el: (news-save-item-in-file) + * rnews.el (news-save-item-in-file): Append to file, rather than overwriting. * isearch.el @@ -2521,10 +2521,10 @@ No, this directory is added automatically to the path used by call-process. It should have worked before. - RMS - * loaddefs.el: C-z -> C-c in documentation for mail. + * loaddefs.el: C-z -> C-c in documentation for mail. autoload report-emacs-bug from emacsbug.el. - * emacsbug.el: New file. Reports bugs with version info. + * emacsbug.el: New file. Reports bugs with version info. * helper.el (Helper-describe-bindings): Make it describe local bindings faster by binding global map to @@ -2532,7 +2532,7 @@ * lisp-mode.el: First form of prog1 is distinguished. - * loaddefs.el: autoload functions from chistory.el and echistory.el. + * loaddefs.el: Autoload functions from chistory.el and echistory.el. * chistory.el: New file containing two alternatives to `repeat-complex-command' @@ -2585,10 +2585,10 @@ 1985-06-11 K. Shane Hartman (shane@mit-prep) - * ebuff-menu.el: Make M-C-v scroll-other-window instead of + * ebuff-menu.el: Make M-C-v scroll-other-window instead of scroll-down. Make M-v scroll-down. - * ebuff-menu.el, echistory.el: Made them use electric. + * ebuff-menu.el, echistory.el: Made them use electric. * electric.el: New module for packages that retain control until some event @@ -2600,7 +2600,7 @@ Made it use helper.el. Remove kill-ring-save stuff pending use of new winning prin1-to-string for minibuffer hacking. - * view.el: Made it use helper.el. + * view.el: Made it use helper.el. * helper.el: New module for packages which want to do help without giving up @@ -2802,7 +2802,7 @@ 1985-06-01 K. Shane Hartman (shane@mit-prep) - * loaddefs.el: Update documentation for rmail. + * loaddefs.el: Update documentation for rmail. * lisp-mode.el (calculate-lisp-indent): Asked (fboundp 'lisp-indent-hook). Right question is boundp. @@ -2856,7 +2856,7 @@ Skip strings, comments, char constants. Find symbols even if they have no letters in them. - * mlsupport.el: Insert symbol-value call in use-local-map. + * mlsupport.el: Insert symbol-value call in use-local-map. Handle key codes > 127 in local-bind-to-key. Write ml-modify-syntax-entry. @@ -3165,7 +3165,7 @@ 1985-05-16 K. Shane Hartman (shane@mit-prep) * dired.el: Put dired-rename-file, dired-copy file-on keys. Make - them change buffer if appropriate. Put dired-mark-backup-files, + them change buffer if appropriate. Put dired-mark-backup-files, dired-mark-temp-files on keys. Eliminate possibility of looping at last line in dired-repeat-over-filenames. @@ -3194,53 +3194,56 @@ replace loop so that replacing continues after moving back to previous. - * add-log.el: add prefix arg to add-change-log-entry so will + * add-log.el: Add prefix arg to add-change-log-entry so will prompt for information if desired. If there is an entry for today, make sure login-name is same before using it, else make new entry. Use auto-fill-mode. 1985-05-12 Richard M. Stallman (rms@mit-prep) - * lisp-mode.el: defined lisp-mode-commands, lisp-mode-variables. + * lisp-mode.el: Defined lisp-mode-commands, lisp-mode-variables. Added external-lisp-mode. Made doc strings mention mode hook variables. - * shell.el: defined functions `lisp' and `inferior-lisp-mode'. + * shell.el: Defined functions `lisp' and `inferior-lisp-mode'. Renamed shell-send-defun... to lisp-send-defun... and made them use process "lisp", buffer *lisp*. - * text-mode.el: made indented-text-mode not call text-mode. + * text-mode.el: Made indented-text-mode not call text-mode. Made doc strings mention mode hook variables. * c-mode.el: Made doc strings mention mode hook variables. - * add-log.el + * add-log.el: Change format used for change log entries. Select indented-text-mode for the change log file. 1985-05-12 K. Shane Hartman (shane@mit-ajax) - simple.el: suppress matching close paren if preceded + + * simple.el: Suppress matching close paren if preceded by char syntax \. - mim-mode.el: flush private paren blinker in favor of default. - add-log.el: change mode-string to mode-name so reflected in + * mim-mode.el: Flush private paren blinker in favor of default. + * add-log.el: Change mode-string to mode-name so reflected in mode-line. change \\W to \\sW when looking for place to add. 1985-05-12 Richard M. Stallman (rms@mit-prep) - simple.el: modified open-line to insert newlines before + + * simple.el: Modified open-line to insert newlines before an existing one before dot. This makes better redisplay. - dired.el: Installed Shane's changes that allow user to choose + * dired.el: Installed Shane's changes that allow user to choose switches to use. 1985-05-11 Richard M. Stallman (rms@mit-prep) - rmail.el: if given file name as argument, + + * rmail.el: If given file name as argument, correctly displays one message of that file but does not try to get new mail. - simple.el: Fix what-line bug: line # too high by 1 if not at bol. + * simple.el: Fix what-line bug: line # too high by 1 if not at bol. Put in blink-matching-paren-distance, and check for wrong kinds of parens matching. - time.el: Put in display-time-day-and-date flag, + * time.el: Put in display-time-day-and-date flag, to display day and date in addition to the time. - startup.el: Call lisp-interaction-mode-hook if defined. + * startup.el: Call lisp-interaction-mode-hook if defined. Set current buffer variables from defaults in case user's init file has changed them. === modified file 'lisp/ChangeLog.14' --- lisp/ChangeLog.14 2010-07-24 11:53:19 +0000 +++ lisp/ChangeLog.14 2010-07-29 02:42:53 +0000 @@ -640,7 +640,7 @@ 2009-04-11 Chong Yidong - * files.el (dir-locals-directory-cache): Rename from + * files.el (dir-locals-directory-cache): Rename from dir-locals-directory-alist. Change format to include the mtime of the directory-local variables file (Bug#2833). (dir-locals-set-directory-class): New arg mtime. Store it in === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2010-07-24 11:53:19 +0000 +++ lisp/ChangeLog.9 2010-07-29 02:42:53 +0000 @@ -1667,7 +1667,7 @@ * Makefile.in (finder_setwins): Renamed from nonobsolete_setwins. Don't include term/. - * mail/sc.el: Moved to obsolete/. + * mail/sc.el: Moved to obsolete/. 2001-08-14 Vinicius Jose Latorre @@ -5547,7 +5547,7 @@ 2001-02-12 Dave Love - * international/latin1-disp.el: Doc fixes. + * international/latin1-disp.el: Doc fixes. (latin1-display) : Add :link. (latin1-display) : Set variable latin1-display. @@ -5978,7 +5978,7 @@ * shell.el (shell-write-history-on-exit): Make sure that we are in the shell buffer (M-x tex-file RET inserted the error message into - the TeX buffer). + the TeX buffer). 2001-01-27 Eli Zaretskii @@ -8747,7 +8747,7 @@ 2000-11-13 Miles Bader * textmodes/fill.el (skip-line-prefix): New function. - (fill-region-as-paragraph, fill-region): Return the fill-prefix. + (fill-region-as-paragraph, fill-region): Return the fill-prefix. (fill-paragraph): Don't leave point inside the fill-prefix. * textmodes/refill.el (refill-fill-paragraph-at): Don't leave point inside the fill-prefix. @@ -10795,7 +10795,7 @@ 2000-10-06 Dave Love * textmodes/fill.el (sentence-end-double-space) - (sentence-end-without-period): Doc fix. + (sentence-end-without-period): Doc fix. (adaptive-fill-regexp): Purecopy. (unjustify-current-line): Use line-end-position. (fill-individual-paragraphs-prefix): Use line-beginning-position. @@ -11871,7 +11871,7 @@ * strokes.el: Sync with maintainer's current version with changes for Emacs, but avoid runtime cl and levents. - (toplevel): Change autoloads and compilation requires. + (toplevel): Change autoloads and compilation requires. (strokes-version, strokes-bug-address, strokes-lift): Values changed. (strokes-xpm-header, strokes-insinuated): New variable. @@ -11934,12 +11934,12 @@ 2000-09-14 Dave Love * toolbar/cancel.xpm, toolbar/close.xpm, toolbar/copy.xpm, - toolbar/cut.xpm, toolbar/exit.xpm, toolbar/fld_open.xpm, - toolbar/help.xpm, toolbar/info.xpm, toolbar/mail.xpm, - toolbar/mail_compose.xpm, toolbar/new.xpm, toolbar/open.xpm, - toolbar/paste.xpm, toolbar/preferences.xpm, toolbar/print.xpm, - toolbar/save.xpm, toolbar/saveas.xpm, toolbar/search-replace.xpm, - toolbar/search.xpm, toolbar/spell.xpm, toolbar/undo.xpm: New. + * toolbar/cut.xpm, toolbar/exit.xpm, toolbar/fld_open.xpm, + * toolbar/help.xpm, toolbar/info.xpm, toolbar/mail.xpm, + * toolbar/mail_compose.xpm, toolbar/new.xpm, toolbar/open.xpm, + * toolbar/paste.xpm, toolbar/preferences.xpm, toolbar/print.xpm, + * toolbar/save.xpm, toolbar/saveas.xpm, toolbar/search-replace.xpm, + * toolbar/search.xpm, toolbar/spell.xpm, toolbar/undo.xpm: New. From Tuomas Kuosmanen . (Gnome icons fetched from .) @@ -14832,7 +14832,7 @@ (comint-replace-by-expanded-history) (comint-get-old-input-default, comint-show-output) (comint-backward-matching-input, comint-forward-matching-input) - (comint-next-prompt, comint-previous-prompt): Use field + (comint-next-prompt, comint-previous-prompt): Use field properties if comint-use-prompt-regexp-instead-of-fields is nil. (comint-line-beginning-position): New function. (comint-bol): Use comint-line-beginning-position. Make ARG optional. @@ -18040,7 +18040,7 @@ (help-xref-interned): Maybe insert face doc too. Separate sections with a line of hyphens. - * faces.el: Some doc fixes. Declare some functions obsolete. + * faces.el: Some doc fixes. Declare some functions obsolete. (describe-face): Add customize button. Return the help text. Fix prompt. @@ -20406,7 +20406,7 @@ 2000-01-10 Ken Stevens - * ispell.el: Only define dictionaries in menus when they exist. + * ispell.el: Only define dictionaries in menus when they exist. (version18p): New variable. (version20p): New variable. (xemacsp): New variable. === modified file 'lisp/gnus/ChangeLog.2' --- lisp/gnus/ChangeLog.2 2010-07-24 11:53:19 +0000 +++ lisp/gnus/ChangeLog.2 2010-07-29 02:42:53 +0000 @@ -2603,7 +2603,7 @@ * message.el (message-use-idna): Use mm-coding-system-p. (message-tokenize-header, message-make-organization) - (message-make-from): Use with-temp-buffer. + (message-make-from): Use with-temp-buffer. (message-set-work-buffer): Deleted. (message-fill-paragraph): Use `if' not `and' for compiler warning. (message-check-news-header-syntax): Remove useless lambda. @@ -5643,7 +5643,7 @@ 2003-01-12 Raymond Scholz - * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a + * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a regexp or a function too. (gnus-confirm-treat-mail-like-news): New variable. Ask for confirmation even if the original article is mail. @@ -16855,7 +16855,7 @@ * gnus-msg.el (gnus-summary-mail-forward): ??? - * message.el (message-forward): Move mime-to-mml here. + * message.el (message-forward): Move mime-to-mml here. 2000-12-20 02:00:00 ShengHuo ZHU @@ -17157,7 +17157,7 @@ * nnheader.el: Wrap subst-char-in-string def in eval-and-compile. Put some defvars in eval-when-compile. - (gnus-intersection, gnus-sorted-complement): Autoload. + (gnus-intersection, gnus-sorted-complement): Autoload. * imap.el (imap-point-at-eol): New, replacing gnus-point-at-eol. @@ -17329,7 +17329,7 @@ * qp.el (mm-decode-coding-region, mm-encode-coding-region): Autoload. - (quoted-printable-decode-region): Rename arg which confused + (quoted-printable-decode-region): Rename arg which confused charset with coding-system. Don't use nonascii-insert-offset. Coding-system encode the region initially. Don't recognize `==' as valid QP. Coding-system decode the region finally. @@ -17384,7 +17384,7 @@ 2000-09-29 Gerd Moellmann - * smiley-ems.el (smiley-update-cache): Use `:ascent center'. + * smiley-ems.el (smiley-update-cache): Use `:ascent center'. 2000-09-21 Dave Love @@ -18036,7 +18036,7 @@ * gnus-art.el (gnus-mime-display-part): Show MIME security button. (gnus-insert-mime-security-button): New function. * mm-decode.el (mm-possibly-verify-or-decrypt): Add security info. - * mml2015.el: Add security info when verify or decrypt. + * mml2015.el: Add security info when verify or decrypt. * mm-uu.el (mm-uu-pgp-signed-extract): Use multipart. (mm-uu-pgp-encrypted-extract): Ditto. @@ -18433,7 +18433,7 @@ (mm-dissect-multipart): Use it. * mml2015.el (mml2015-fix-micalg): New function. (mml2015-decrypt): Use new interface. - (mml2015-verify): Use new interface. + (mml2015-verify): Use new interface. (mml2015-setup): Make it bogus. 2000-10-28 16:54:45 ShengHuo ZHU === modified file 'lisp/mh-e/ChangeLog.1' --- lisp/mh-e/ChangeLog.1 2010-07-24 11:53:19 +0000 +++ lisp/mh-e/ChangeLog.1 2010-07-29 02:42:53 +0000 @@ -333,9 +333,9 @@ Synced with manual. (mh-junk-program): Use double-quotes on non-symbols. - * mh-pick.el: (mh-search-folder): Synced docstrings with manual. + * mh-pick.el (mh-search-folder): Synced docstrings with manual. - * mh-index.el: (mh-index-search, mh-pick-execute-search) + * mh-index.el (mh-index-search, mh-pick-execute-search) (mh-grep-execute-search, mh-mairix-execute-search) (mh-swish-execute-search, mh-swish++-execute-search) (mh-namazu-execute-search): Synced docstrings with manual. Note @@ -659,13 +659,13 @@ * mh-mime.el (mh-display-with-external-viewer): Checkdoc fixes. - * mh-identity.el: (mh-identity-attribution-verb-end): Stripped + * mh-identity.el (mh-identity-attribution-verb-end): Stripped trailing space; checkdoc fixes. * mh-e.el (mh-restore-desktop-buffer): Checkdoc fixes. - * mh-customize.el: (mh-inc-spool-list, - mh-compose-forward-as-mime-flag, defcustom): Stripped trailing + * mh-customize.el (mh-inc-spool-list) + (mh-compose-forward-as-mime-flag, defcustom): Stripped trailing space; checkdoc fixes. * mh-comp.el (mh-reply): Stripped trailing space. @@ -794,7 +794,7 @@ Merged in 7.4.4 changes, described below. - * mh-e.el (Version, mh-version): Set to 7.4.4+cvs. + * mh-e.el (Version, mh-version): Set to 7.4.4+cvs. 2004-07-10 Bill Wohler @@ -1214,7 +1214,7 @@ * mh-loaddefs.el: Regenerated. * mh-index.el (mh-indexer-choices): Remove option for the non-free - glimpse indexer (closes SF #831276). + glimpse indexer (closes SF #831276). (mh-glimpse-binary, mh-glimpse-directory) (mh-glimpse-execute-search, mh-glimpse-next-result): Functions and variables to implement glimpse support are removed. @@ -1819,7 +1819,7 @@ 2003-08-19 Bill Wohler - * mh-seq.el: (mh-edit-pick-expr): Renamed from mh-read-pick-regexp + * mh-seq.el (mh-edit-pick-expr): Renamed from mh-read-pick-regexp since the new name is more indicative of what the function does. Prompt now says "Pick expression" instead of "Pick regexp". (mh-narrow-to-subject): Rewrote function to behave like other @@ -1980,7 +1980,7 @@ * mh-comp.el (mh-send-letter): Go to the top of the draft so that the user can see which header fields have been inserted. I think this is more important than leaving point alone or going to the - end to see the signature since Mail-Followup-To or Bcc or cc could + end to see the signature since Mail-Followup-To or Bcc or cc could have some deleterious effects. * mh-customize.el (mh-auto-fields-prompt-flag): New variable. @@ -2197,7 +2197,7 @@ * mh-comp.el (mh-extract-rejected-mail, mh-letter-mode-message): Ditto. - * mh-e.el (mh-refile-a-msg): Ditto. + * mh-e.el (mh-refile-a-msg): Ditto. * mh-funcs.el (mh-undo-folder): Ditto. @@ -2509,7 +2509,7 @@ 2003-07-28 Peter S Galbraith - * mh-comp.el (mh-insert-letter): Remove `mh-visible-headers' + * mh-comp.el (mh-insert-letter): Remove `mh-visible-headers' operation. * mh-mime.el (mh-mm-inline-message): Same. @@ -2697,7 +2697,7 @@ 2003-06-24 Bill Wohler - * mh-e.el (Version, mh-version): Set to 7.4.1+cvs. + * mh-e.el (Version, mh-version): Set to 7.4.1+cvs. 2003-06-25 Bill Wohler @@ -2719,7 +2719,7 @@ 2003-06-24 Bill Wohler - * mh-e.el (Version, mh-version): Set to 7.4+cvs. + * mh-e.el (Version, mh-version): Set to 7.4+cvs. 2003-06-24 Bill Wohler @@ -2763,7 +2763,7 @@ replacement text. (mh-index-parse-search-regexp): Preserve case of search terms. This is needed to take advantage of the acronym indexing in - swish++ (closes SF #755718). + swish++ (closes SF #755718). 2003-06-13 Satyaki Das @@ -4106,7 +4106,7 @@ 2003-04-06 Bill Wohler - * mh-comp.el (mh-forward): Updated docstrings to indicate that a + * mh-comp.el (mh-forward): Updated docstrings to indicate that a list of messages is acceptable as well. * mh-e.el (mh-delete-msg, mh-delete-msg-no-motion, mh-refile-msg) @@ -4198,7 +4198,7 @@ 2003-04-04 Peter S Galbraith - * mh-e.el (mh-folder-from-address): Minor Fix. Wrong ending of + * mh-e.el (mh-folder-from-address): Minor Fix. Wrong ending of `when' block. 2003-04-04 Satyaki Das @@ -5383,7 +5383,7 @@ * import-emacs: MH-E now has its own directory in Emacs. - * mh-e.el: (mh-version): Set to 7.2+cvs. + * mh-e.el (mh-version): Set to 7.2+cvs. 2003-02-03 Bill Wohler @@ -6883,7 +6883,7 @@ * mh-e.el (mh-add-cur-notation): New function to mark the current message with the mh-note-cur character. (mh-get-new-mail): Use mh-add-cur-notation to undo the work of - mh-remove-cur-notation if there was no new mail (closes SF #647681). + mh-remove-cur-notation if there was no new mail (closes SF #647681). * mh-e.el (mh-set-cmd-note): Do not update the default mh-cmd-note value (closes SF #643701). @@ -7247,7 +7247,7 @@ 2002-11-13 Mark D. Baushke - * mh-identity.el (mh-insert-identity): A value of either nil or + * mh-identity.el (mh-insert-identity): A value of either nil or "" should cause the field to be removed. (mh-identity-list): Update the docstring. @@ -7911,7 +7911,7 @@ (mh-folder-font-lock-subject): Adapt to new mh-scan-subject-regexp. * mh-seq.el (mh-subject-to-sequence): Ditto. - * mh-e.el (mh-folder-sequence-menu): Remove "Toggle Subject + * mh-e.el (mh-folder-sequence-menu): Remove "Toggle Subject Thread" from menu. mh-toggle-threads is in the Folder menu. * mh-e.el (mh-folder-sequence-menu): Minor menu text edits. @@ -8250,7 +8250,7 @@ (mh-thread-generate-scan-lines): Renamed dupl-p as dupl-flag. This addresses part of SF #627015. - * mh-index.el (mh-index-advance): Renamed backward-p + * mh-index.el (mh-index-advance): Renamed backward-p local variable as backward-flag. (mh-index-next-button): Renamed backward-p argument as backward-flag. @@ -9217,7 +9217,7 @@ decide how many buttons to use for replying. * mh-mime.el (mh-file-mime-type-substitutions) - (mh-file-mime-type-substitute): Fix typos and doc strings. + (mh-file-mime-type-substitute): Fix typos and doc strings. 2002-09-30 Peter S Galbraith @@ -9321,7 +9321,7 @@ 2002-08-19 Peter S Galbraith * reply-to.xpm, reply-to.pbm, reply-from.xpm, reply-from.pbm, - * reply-all.xpm, reply-all.pbm: New icons for various reply methods. + * reply-all.xpm, reply-all.pbm: New icons for various reply methods. * mh-e.el (mh-folder-tool-bar-map): Split reply button into three that won't prompt for "from", "to" and "all". * mh-comp.el (mh-reply): Put variable reply-to in the interactive @@ -9760,13 +9760,13 @@ to `mh-mml-to-mime' in `mh-send-letter'. (mh-mml-secure-message-sign-pgpmime): New function. Front end to mml-secure-message-sign-pgpmime. - (mh-mml-secure-message-encrypt-pgpmime): New function. + (mh-mml-secure-message-encrypt-pgpmime): New function. Front end to mml-secure-message-encrypt-pgpmime. * mh-comp.el (mh-send-letter): automatic call to `mh-mml-to-mime' if mh-mml-compose-insert-p is set. (mh-letter-mode-map): Add keys for new mh-mime functions above. - * mh-comp.el: Added autoloads for new mh-mime functions above. + * mh-comp.el: Added autoloads for new mh-mime functions above. 2002-06-17 Peter S Galbraith @@ -10501,7 +10501,7 @@ * mh-comp.el: Require mh-e and easymenu, moved autoloads to top of file. - * Makefile: (EMACS): New constant to hold emacs calling sequence. + * Makefile (EMACS): New constant to hold emacs calling sequence. (install): Renamed to install-emacs. (compile): New target to compile all files. (dist): Make dependent on compile. @@ -10738,7 +10738,7 @@ 2001-11-29 Jeffrey C Honig - * mh-utils.el: (mh-find-progs): Change mh-find-progs to rely on + * mh-utils.el (mh-find-progs): Change mh-find-progs to rely on the existence of mhparam. The location of mhparam is used to find `mh-progs'. It uses the libdir and etcdir to find the `mh-lib-progs' and `mh-lib' directories. If etcdir doesn't return @@ -10795,7 +10795,7 @@ set mh-page-to-next-msg-p to t. The second time the end of page is hit, go to the next message. - * mh-utils.el: (mh-show-msg): Initialize mh-page-to-next-msg-p to + * mh-utils.el (mh-show-msg): Initialize mh-page-to-next-msg-p to nil. 2001-11-27 Bill Wohler @@ -11004,8 +11004,8 @@ 2001-11-20 Peter S Galbraith * mh-comp.el (mh-letter-mode): Make font-lock-defaults a local variable - * mh-e.el (mh-folder-mode): Same. - * mh-utils.el (mh-show-mode): Same. + * mh-e.el (mh-folder-mode): Same. + * mh-utils.el (mh-show-mode): Same. * mh-e.el (mh-scan-msg-num-regexp): Delete variable and replace with mh-good-msg-regexp. @@ -11279,7 +11279,7 @@ * mh-e.el (mh-refile-msg): Mark messages in region for refiling if mark is active and in transient-mark-mode. * mh-e.el (mh-undo): Undo message marks for refile or deletion if - region if mark is active and in transient-mark-mode. + region if mark is active and in transient-mark-mode. 2001-11-06 Peter S Galbraith === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-28 17:34:51 +0000 +++ src/ChangeLog 2010-07-29 02:42:53 +0000 @@ -5,7 +5,7 @@ * xdisp.c (Qtext_image_horiz): Define. (syms_of_xdisp): Initialize Qtext_image_horiz. Add text-image-horiz - to ducumentation of tool-bar-style. + to documentation of tool-bar-style. * lisp.h (Qtext_image_horiz): Declare. === modified file 'src/ChangeLog.2' --- src/ChangeLog.2 2010-07-24 11:53:19 +0000 +++ src/ChangeLog.2 2010-07-29 02:42:53 +0000 @@ -683,7 +683,7 @@ (That `select' saw something on channel 0 doesn't mean it is kbd input; it could be an expose event.) - * keyboard.c (read_avail_input) [FIONREAD]: Now static. + * keyboard.c (read_avail_input) [FIONREAD]: Now static. New arg specifies value of NREAD; if it is nonzero, don't call get_input_pending to get it. Use kbd_buffer_store_char to put chars into kbd_buffer. @@ -1210,7 +1210,7 @@ Remove #ifndef VMS around the sleep when buffer is full. * s-vms.h: Define nonstandard PENDING_OUTPUT_COUNT for VMS use. - * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp. + * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp. 1987-07-17 Paul Rubin (phr@prep) @@ -1323,7 +1323,7 @@ 1987-06-09 Richard M. Stallman (rms@prep) - * syntax.c: (scan_lists): Clear mathexit on 2nd math-char in a pair. + * syntax.c (scan_lists): Clear mathexit on 2nd math-char in a pair. 1987-06-08 Richard M. Stallman (rms@prep) @@ -1442,7 +1442,7 @@ Turn on call to vmserrstr. * sysdep.c (vmserrstr) [VMS]: Define this function. - * process.c (create_process) [IRIS]: Don't open the pty's tty + * process.c (create_process) [IRIS]: Don't open the pty's tty in the parent process. Open only once, in the child. * xdisp.c (redisplay_window): If window-start points nowhere, @@ -1544,8 +1544,8 @@ 1987-05-05 Richard Mlynarik (mly@prep) - * m-irist.h: New version from raible@orville.arpa - * s-iris3-5.h: New file. (s-usg5-2 with additions) + * m-irist.h: New version from raible@orville.arpa + * s-iris3-5.h: New file. (s-usg5-2 with additions) * keyboard.c: IRIS, like HPUX, #defines but does not implement FIONREAD. @@ -1566,7 +1566,7 @@ Fcopy_file, Fset_file_modes: Don't use un*x modes if env var USE_DOMAIN_ACLS is set. Fset_file_modes: utimes fix. - Finsert_file_contents: Must do fstat after open for Apollo. + Finsert_file_contents: Must do fstat after open for Apollo. * emacs.c (main): (APOLLO from lnz): Don't use un*x modes if env var USE_DOMAIN_ACLS set. @@ -1675,7 +1675,7 @@ 1987-03-20 Richard Mlynarik (mly@prep) - * filemode.c: Hacks for set-uid/gid but not executable. + * filemode.c: Hacks for set-uid/gid but not executable. 1987-03-20 Richard M. Stallman (rms@prep) @@ -1966,7 +1966,7 @@ 1987-02-22 Richard M. Stallman (rms@prep) - * dispnew.c (Fopen_termscript): Close existing termscript + * dispnew.c (Fopen_termscript): Close existing termscript file before trying to open a new one. Report open failure with report_file_error. @@ -2071,7 +2071,7 @@ 1987-02-10 Richard Mlynarik (mly@prep) - * xfns.c (Fx_get_default): Add (unsigned char *) cast. + * xfns.c (Fx_get_default): Add (unsigned char *) cast. * window.c: typo. @@ -2853,7 +2853,7 @@ local variables for more register decls. Compute and pass `envlen' arg to child_setup. - * process.c (create_process): Compute and pass `envlen' arg + * process.c (create_process): Compute and pass `envlen' arg to child_setup. * xterm.c (x_term_init): Don't call XPopUpWindow at all. @@ -3998,7 +3998,7 @@ * editfns.c (Fuser_uid, Fuser_real_uid): New functions that return values of geteuid and getuid system calls. - * dired.c (Ffile_attributes): Value has additional element + * dired.c (Ffile_attributes): Value has additional element t iff file gid would change if Emacs deletes it and recreates it. * xdisp.c (display_mode_element): @@ -4078,7 +4078,7 @@ being unbound. struct catchtag has two new fields, gcpro and pdlcount. - * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp. + * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp. * eval.c (internal_catch): No need to restore anything from the catchtag after throw, because unbind_catch does it all. @@ -4657,14 +4657,14 @@ * fileio.c (Ffile_newer_than_file_p): New Lisp primitive. - * fileio.c (Ffile_exists_p): this is now distinct from + * fileio.c (Ffile_exists_p): This is now distinct from Ffile_readable_p; it checks only for existence, not for readability. * editfns.c (Fgoto_char): Use new interactive code N. - * callint.c (Fcall_interactively): New code N - means use prefix argif have one, else read number from minibuffer. + * callint.c (Fcall_interactively): New code N means use + prefix arg if have one, else read number from minibuffer. * buffer.c (record_buffer): Don't use Frassq, Fmemq or Fdelq since their loops === modified file 'src/ChangeLog.5' --- src/ChangeLog.5 2010-07-24 11:53:19 +0000 +++ src/ChangeLog.5 2010-07-29 02:42:53 +0000 @@ -176,7 +176,7 @@ 1995-06-12 Roland McGrath * mem-limits.h [_LIBC] (start_of_data): Define to &__data_start - for GNU libc. + for GNU libc. 1995-06-11 Richard Stallman @@ -227,7 +227,7 @@ * xterm.c (x_get_keysym_name): New function. * keyboard.c (modify_event_symbol): Mask out high bits here, and only for certain purposes. table_size now unsigned. - (modify_event_symbol) [HAVE_X_WINDOWS]: Use x_get_keysym_name. + (modify_event_symbol) [HAVE_X_WINDOWS]: Use x_get_keysym_name. (make_lispy_event): Don't mask high bits here. Supply -1 as table_size for system-specific keys. @@ -316,9 +316,9 @@ (Fexecute_extended_command, init_kboard, syms_of_keyboard): Undo Feb 28 change; prefix arg handling is now in Lisp code again. - * buffer.c: (syms_of_buffer): Doc fix. + * buffer.c (syms_of_buffer): Doc fix. - * buffer.c: (Fbuffer_disable_undo): Make this function interactive. + * buffer.c (Fbuffer_disable_undo): Make this function interactive. 1995-06-07 Richard Stallman @@ -335,7 +335,7 @@ (ALL_CFLAGS): Insert $(TOOLKIT_DEFINES) here. * xfns.c (syms_of_xfns): Provide motif in Motif version. - * lisp.h: (Fwaiting_for_user_input_p): Function declared. + * lisp.h (Fwaiting_for_user_input_p): Function declared. (Fupcase_initials, Fupcase_initials_region): Likewise. (Fplist_get, get_local_map, Fx_popup_menu, Fx_popup_dialog): Likewise. (Fframe_first_window): Likewise. @@ -849,7 +849,7 @@ 1995-05-07 Richard Stallman * process.c (wait_reading_process_input): Pass arg in new call to - set_waiting_for_input. + set_waiting_for_input. * xfns.c (Funfocus_frame): Check for live X frame. @@ -1366,8 +1366,8 @@ 1995-04-11 Roland McGrath * process.c (create_process): Set PROCESS's tty_name to Qnil when - !PTY_FLAG, so Fprocess_tty_name returns nil for pipes as its - docstring says. + !PTY_FLAG, so Fprocess_tty_name returns nil for pipes as its + docstring says. 1995-04-11 Richard Stallman @@ -1764,12 +1764,12 @@ * keyboard.c (kbd_buffer_get_event): Pass 0 for `insist' arg. * m/intel386.h (C_SWITCH_SYSTEM): Don't #undef or define it. - [SOLARIS2, SOLARIS2_4, !__GNUC__] (C_SWITCH_MACHINE): Define instead. + [SOLARIS2, SOLARIS2_4, !__GNUC__] (C_SWITCH_MACHINE): Define instead. 1995-03-26 Germano Caronni * ralloc.c (r_re_alloc): Correct realloc behavior--allow shrinking - of blocks while reallocating, if shrinking by more than one page. + of blocks while reallocating, if shrinking by more than one page. (relocate_blocs, resize_blocs): Added failsafe to protect future calling of these routines when in frozen state. (r_alloc_thaw): Added call to r_alloc_init. @@ -1820,7 +1820,7 @@ * m/sparc.h: Don't include alloca.h if NOT_C_CODE. * m/mips-siemens.h (UNEXEC): Override the definition. - (LIBS_DEBUG, ORDINARY_LINK): Add #undefs. + (LIBS_DEBUG, ORDINARY_LINK): Add #undefs. 1995-03-22 Karl Heuer @@ -2334,7 +2334,7 @@ 1995-02-14 Richard Stallman - * filelock.c: (unlock_buffer, unlock_all_files, Flock_buffer) + * filelock.c (unlock_buffer, unlock_all_files, Flock_buffer) (Funlock_buffer): Use buffer's file_truename, not filename. * buffer.c (syms_of_buffer): Set up Lisp var buffer-file-truename. @@ -3107,7 +3107,7 @@ * lisp.h (enum Lisp_Type): Lisp_Process, Lisp_Window, Lisp_Frame, Lisp_Subr deleted. - (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting. + (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting. (PROCESSP, GC_PROCESSP, XSETPROCESS): Rewrite to use pseudovectors. (WINDOWP, GC_WINDOWP, XSETWINDOW): Likewise. (FRAMEP, GC_FRAMEP): Likewise. @@ -3461,7 +3461,7 @@ 1994-11-19 Francesco Potortì - * lisp.h: (running_asynch_code): New global flag. + * lisp.h (running_asynch_code): New global flag. * emacs.c (running_asynch_code): New global flag. (main): Initialise it. * process.c (read_process_output, exec_sentinel): Set and @@ -3493,7 +3493,7 @@ 1994-11-17 Karl Heuer - * lisp.h: (enum Lisp_Misc_Type): Rename Lisp_Vector to + * lisp.h (enum Lisp_Misc_Type): Rename Lisp_Vector to Lisp_Vectorlike. Mark Lisp_Window_Configuration as obsolete. (PSEUDOVECTOR_FLAG, PSEUDOVECTOR_SIZE_MASK, PVEC_BUFFER, PVEC_PROCESS, PVEC_FRAME, PVEC_COMPILED, PVEC_WINDOW, @@ -3645,7 +3645,7 @@ 1994-11-14 Karl Heuer - * lisp.h: (enum Lisp_Misc_Type): Add new enumeration Lisp_Misc_Overlay. + * lisp.h (enum Lisp_Misc_Type): Add new enumeration Lisp_Misc_Overlay. (enum Lisp_Type): Delete the corresponding enumeration from here. (struct Lisp_Overlay): New structure. (XOVERLAY, OVERLAYP): Access the new structure. @@ -3711,7 +3711,7 @@ 1994-11-11 Karl Heuer - * lisp.h: (enum Lisp_Misc_Type): Add new enumerations + * lisp.h (enum Lisp_Misc_Type): Add new enumerations Lisp_Misc_Buffer_Local_Value and Lisp_Misc_Some_Buffer_Local_Value. (enum Lisp_Type): Delete the corresponding enumerations from here. (struct Lisp_Buffer_Local_Value): New structure. @@ -3798,7 +3798,7 @@ * xfns.c (Fx_list_fonts): Don't bother to retrieve font info when there's no size_ref to compare it against. - * editfns.c: (Fdecode_time): Fix Lisp_Object vs. integer problems. + * editfns.c (Fdecode_time): Fix Lisp_Object vs. integer problems. Don't use tm_gmtoff; it's not portable. * lisp.h: Leave DEVICE_SEP undefined by default. @@ -3955,7 +3955,7 @@ Use the return value of child_setup to get the child's pid; don't call vfork etc. explicitly. - * callproc.c [WINDOWSNT]: Add includes. Define NOMINMAX, _P_NOWAIT. + * callproc.c [WINDOWSNT]: Add includes. Define NOMINMAX, _P_NOWAIT. (Vbinary_process_input, Vbinary_process_output) (Qbuffer_file_type): Test DOS_NT, not MSDOS. (syms_of_callproc): Test DOS_NT, not MSDOS. @@ -4367,7 +4367,7 @@ (the_x_screen): Variable moved here. (syms_of_xterm): Staticpro parts of the_x_screen. * xfns.c (Fx_open_connection): Get dpyinfo from x_term_init. - Don't set up atoms, xrdb here. Pass name as Lisp_Object. + Don't set up atoms, xrdb here. Pass name as Lisp_Object. (the_x_screen): Variable moved to xterm.c. (syms_of_xfns): Don't staticpro it here. @@ -4511,7 +4511,7 @@ 1994-10-19 Karl Heuer - * search.c: (searchbufs): New variable, replaces searchbuf and + * search.c (searchbufs): New variable, replaces searchbuf and last_regexp and search_fastmap. (syms_of_search): Initialize it. (searchbuf_head): New variable. @@ -4597,7 +4597,7 @@ * frame.h [!MULTI_FRAME]: We give up having selected_frame be an always-zero integer variable. From now on it will be a pointer to a `struct frame' just like in the MULTI_FRAME case. - (selected_frame, last_nonminibuf_frame): use FRAME_PTR, not EMACS_INT. + (selected_frame, last_nonminibuf_frame): use FRAME_PTR, not EMACS_INT. (XFRAME): Redefine to use the_only_frame. (XSETFRAME): Define to set Lisp value. (WINDOW_FRAME): Redefine to return Lisp value. @@ -4640,7 +4640,7 @@ (the_only_x_display, x_current_display) [!HAVE_X_WINDOWS]: New variables. - * msdos.h: (XFontStruct, GC, Pixmap, Display, Window) [MSDOS_NO_X]: + * msdos.h (XFontStruct, GC, Pixmap, Display, Window) [MSDOS_NO_X]: Dummy types. (struct face, FACE_HAS_GC, FACE_GC, FACE_FOREGROUND, FACE_BACKGROUND, FACE_FONT, FACE_STIPPLE, FACE_UNDERLINE_P) [MSDOS_NO_X]: Define like @@ -4937,7 +4937,7 @@ (struct Lisp_Free): New structure. (Lisp_Misc_Free): Type code for that structure. * buffer.h (OVERLAY_POSITION): Marker assert now tests substructure. - * alloc.c: (MARKER_BLOCK_SIZE, marker_block, marker_free_list): + * alloc.c (MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the superset type, not just markers. (allocate_misc): New function, extracted from Fmake_marker. (Fpurecopy): Check the substructure. @@ -5185,7 +5185,7 @@ 1994-10-02 Paul Reilly - * xfns.c: (HACK_EDITRES): Declare if using X11R5. + * xfns.c (HACK_EDITRES): Declare if using X11R5. (widget_id_tick): New variable. (x_any_window_to_frame): Use lw_window_is_in_menubar for widget set independence. @@ -7039,7 +7039,7 @@ 1994-06-07 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * mips-siemens.h: Include pyramid.h, not mips.h. + * mips-siemens.h: Include pyramid.h, not mips.h. (LOAD_AVE_TYPE, LOAD_AVE_CVT): Definitions deleted. (NO_ARG_ARRAY, HAVE_ALLOCA): Defined. (BROKEN_FIONREAD): Add #undef. === modified file 'src/ChangeLog.9' --- src/ChangeLog.9 2010-07-24 11:53:19 +0000 +++ src/ChangeLog.9 2010-07-29 02:42:53 +0000 @@ -319,7 +319,7 @@ * lisp.h (Ftop_level): Add prototype. - * xterm.c: (xlwmenu_window_p, xlwmenu_redisplay): Add prototypes. + * xterm.c (xlwmenu_window_p, xlwmenu_redisplay): Add prototypes. (XTread_socket): Improve style of comments to follow other comments. @@ -1496,7 +1496,7 @@ * coding.c (setup_coding_system): Don't do any designation based on reg_bits if charset is not yet defined. - * lisp.h (XVECTOR): Verify correct object type before returning a + * lisp.h (XVECTOR): Verify correct object type before returning a pointer, using eassert. 2001-07-17 Gerd Moellmann @@ -1752,7 +1752,7 @@ creating the directory might signal an error, and leaves Emacs in a strange state. - * term.c: (tty_cursor_hidden): New variable. + * term.c (tty_cursor_hidden): New variable. (update_begin): Don't call tty_hide_cursor. Clean up. (update_end, set_terminal_window, set_scroll_region): Clean up. (ring_bell, reset_terminal_modes): Clean up. @@ -3109,7 +3109,7 @@ * w32term.c (w32_encode_char): Treat eight bit graphic and control characters the same as ASCII and latin-1. - (x_display_and_set_cursor): Check for the focus frame's selected + (x_display_and_set_cursor): Check for the focus frame's selected window instead of selected_window. (x_after_update_window_line): Don't clear if frame's internal border width is zero. @@ -3896,7 +3896,7 @@ 2001-01-07 Dave Love - * keyboard.c (Fread_key_sequence_vector): Avoid newline in + * keyboard.c (Fread_key_sequence_vector): Avoid newline in arglist, for documentation's sake. 2001-01-06 Andrew Innes @@ -4180,7 +4180,7 @@ what's displayed in the window. * xdisp.c (try_window_reusing_current_matrix) - : Disable rows in the current matrix + : Disable rows in the current matrix which are below the window after scrolling. * xdisp.c (move_it_by_lines): Don't do optimizations if NEED_Y_P @@ -5004,7 +5004,7 @@ the metrics of BDF fonts. (x_estimate_mode_line_height): If `mode-line' face hasn't a font, use that of the frame, as drawing glyphs does. - (note_mouse_highlight): Change the cursor shape on the vertical + (note_mouse_highlight): Change the cursor shape on the vertical border between windows [not enabled]. * w32term.h (struct w32_output): Add member horizontal_drag_cursor. @@ -5480,7 +5480,7 @@ * lisp.h (pos_visible_p): Change prototype. * dispextern.h (CURRENT_MODE_LINE_HEIGHT) - (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height + (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height and current_header_line_height first. (current_mode_line_height, current_header_line_height): Declare extern. @@ -6683,7 +6683,7 @@ (create_offscreen_bitmap): New function. (w32_BDF_TextOut): Use it. Draw glyphs as DIBs. - * w32term.c (x_produce_glyphs): If the distance from the current + * w32term.c (x_produce_glyphs): If the distance from the current position to the next tab stop is less than a canonical character width, use the tab stop after that. (x_draw_glyphs): Handle case START and END are out of bounds more @@ -7536,7 +7536,7 @@ CYCLE_CHECK arguments. (merge_face_vector_with_property, Finternal_merge_in_global_face) (lookup_named_face, lookup_derived_face, realize_named_face) - (face_at_string_position, face_at_buffer_position): Supply + (face_at_string_position, face_at_buffer_position): Supply new F and CYCLE_CHECK arguments to merge_face_vectors. (merge_face_heights): New function. (merge_face_vectors, merge_face_vector_with_property) @@ -7826,7 +7826,7 @@ (x_compute_glyph_string_overhangs): Incomplete body removed, as the X way of doing this will not work for W32. (w32_intersect_rectangles): Removed. Use IntersectRect API call. - (x_draw_image_foreground): Avoid drawing outside of the clip area + (x_draw_image_foreground): Avoid drawing outside of the clip area when image doesn't have a mask. (note_mouse_highlight): Process overlays in the right order of priority. Set help_echo_window. @@ -10156,7 +10156,7 @@ (encode_coding_string): Likewise. * ccl.c (ccl_driver) - : Handle charsets eight-bit-control and + : Handle charsets eight-bit-control and eight-bit-graphic correctly. 2000-05-24 Kenichi HANDA @@ -12812,7 +12812,7 @@ (xim_destroy_callback, xim_open_dpy, xim_instantiate_callback) (xim_initialize, xim_close) [HAVE_X_I18N && HAVE_X11R6]: New functions. - (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame. + (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame. (x_term_init) [HAVE_X_I18N]: Call xim_initialize. (x_delete_display) [HAVE_X_I18N]: Call xim_close. @@ -13029,7 +13029,7 @@ 2000-01-19 Dave Love - * lread.c: (syms_of_lread) [user-init-file]: Doc change. + * lread.c (syms_of_lread) [user-init-file]: Doc change. 2000-01-18 Kenichi Handa ------------------------------------------------------------ revno: 100926 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2010-07-29 04:11:23 +0200 message: * make-docfile.c (write_c_args): Warn for old-style empty arglist (). diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-07-25 03:36:54 +0000 +++ lib-src/ChangeLog 2010-07-29 02:11:23 +0000 @@ -1,3 +1,7 @@ +2010-07-29 Juanma Barranquero + + * make-docfile.c (write_c_args): Warn for old-style empty arglist (). + 2010-07-25 Juanma Barranquero * emacsclient.c (getcwd): Fix previous change: make getcwd === modified file 'lib-src/make-docfile.c' --- lib-src/make-docfile.c 2010-07-24 17:18:18 +0000 +++ lib-src/make-docfile.c 2010-07-29 02:11:23 +0000 @@ -442,7 +442,7 @@ register char *p; int in_ident = 0; char *ident_start; - int ident_length; + int ident_length = 0; fprintf (out, "(fn"); @@ -476,6 +476,12 @@ identifier. */ if (c == ',' || c == ')') { + if (ident_length == 0) + { + error ("empty arg list for `%s' should be (void), not ()", func); + continue; + } + if (strncmp (ident_start, "void", ident_length) == 0) continue; ------------------------------------------------------------ revno: 100925 author: Phil Hagelberg committer: Chong Yidong branch nick: trunk timestamp: Wed 2010-07-28 14:54:42 -0400 message: Add support for non-default package repositories. * lisp/emacs-lisp/package.el (package-archive-base): Var deleted. (package-archives): New variable. (package-archive-contents): Doc fix. (package-load-descriptor): Do nothing if descriptor file is missing. (package--write-file-no-coding): New function. (package-unpack-single): Use it. (package-archive-id): New function. (package-download-single, package-download-tar) (package-menu-view-commentary): Use it. (package-installed-p): Make second argument optional. (package-read-all-archive-contents): New function. (package-initialize): Use it. (package-read-archive-contents): Add ARCHIVE argument. (package--add-to-archive-contents): New function. (package-install): Don't call package-read-archive-contents. (package--download-one-archive): Store archive file in a subdirectory of package-user-dir. (package-menu-execute): Remove spurious line movement. * lisp/emacs-lisp/package.el (package-load-list, package-archives) (package-archive-contents, package-user-dir) (package-directory-list, package--builtins, package-alist) (package-activated-list, package-obsolete-alist): Mark as risky. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-28 17:34:51 +0000 +++ lisp/ChangeLog 2010-07-28 18:54:42 +0000 @@ -1,3 +1,33 @@ +2010-07-28 Chong Yidong + + * emacs-lisp/package.el (package-load-list, package-archives) + (package-archive-contents, package-user-dir) + (package-directory-list, package--builtins, package-alist) + (package-activated-list, package-obsolete-alist): Mark as risky. + +2010-07-28 Phil Hagelberg + + Add support for non-default package repositories. + * emacs-lisp/package.el (package-archive-base): Var deleted. + (package-archives): New variable. + (package-archive-contents): Doc fix. + (package-load-descriptor): Do nothing if descriptor file is + missing. + (package--write-file-no-coding): New function. + (package-unpack-single): Use it. + (package-archive-id): New function. + (package-download-single, package-download-tar) + (package-menu-view-commentary): Use it. + (package-installed-p): Make second argument optional. + (package-read-all-archive-contents): New function. + (package-initialize): Use it. + (package-read-archive-contents): Add ARCHIVE argument. + (package--add-to-archive-contents): New function. + (package-install): Don't call package-read-archive-contents. + (package--download-one-archive): Store archive file in a + subdirectory of package-user-dir. + (package-menu-execute): Remove spurious line movement. + 2010-07-28 Jan Djärv * cus-start.el (tool-bar-style): Add text-image-horiz. === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2010-06-20 04:55:14 +0000 +++ lisp/emacs-lisp/package.el 2010-07-28 18:54:42 +0000 @@ -43,9 +43,6 @@ ;; currently register any of these, so this feature does not actually ;; work.) -;; This code supports a single package repository, ELPA. All packages -;; must be registered there. - ;; A package is described by its name and version. The distribution ;; format is either a tar file or a single .el file. @@ -55,11 +52,13 @@ ;; which consists of a call to define-package. It may also contain a ;; "dir" file and the info files it references. -;; A .el file will be named "NAME-VERSION.el" in ELPA, but will be +;; A .el file is named "NAME-VERSION.el" in the remote archive, but is ;; installed as simply "NAME.el" in a directory named "NAME-VERSION". -;; The downloader will download all dependent packages. It will also -;; byte-compile the package's lisp at install time. +;; The downloader downloads all dependent packages. By default, +;; packages come from the official GNU sources, but others may be +;; added by customizing the `package-archives' alist. Packages get +;; byte-compiled at install time. ;; At activation time we will set up the load-path and the info path, ;; and we will load the package's autoloads. If a package's @@ -207,6 +206,7 @@ Hence, the package is \"held\" at that version. If VERSION is nil, the package is not loaded (it is \"disabled\")." :type '(repeat symbol) + :risky t :group 'package :version "24.1") @@ -217,10 +217,16 @@ (declare-function lm-commentary "lisp-mnt" (&optional file)) (declare-function dired-delete-file "dired" (file &optional recursive trash)) -(defconst package-archive-base "http://elpa.gnu.org/packages/" - "Base URL for the Emacs Lisp Package Archive (ELPA). -Ordinarily you should not need to change this. -Note that some code in package.el assumes that this is an http: URL.") +(defcustom package-archives '(("gnu" . "http://elpa.gnu.org/packages/")) + "An alist of archives from which to fetch. +The default value points to the GNU Emacs package repository. +Each element has the form (ID . URL), where ID is an identifier +string for an archive and URL is a http: URL (a string)." + :type '(alist :key-type (string :tag "Archive name") + :value-type (string :tag "Archive URL")) + :risky t + :group 'package + :version "24.1") (defconst package-archive-version 1 "Version number of the package archive understood by this file. @@ -234,8 +240,10 @@ "Cache of the contents of the Emacs Lisp Package Archive. This is an alist mapping package names (symbols) to package descriptor vectors. These are like the vectors for `package-alist' -but have an extra entry which is 'tar for tar packages and -'single for single-file packages.") +but have extra entries: one which is 'tar for tar packages and +'single for single-file packages, and one which is the name of +the archive from which it came.") +(put 'package-archive-contents 'risky-local-variable t) (defcustom package-user-dir (locate-user-emacs-file "elpa") "Directory containing the user's Emacs Lisp packages. @@ -243,6 +251,7 @@ Apart from this directory, Emacs also looks for system-wide packages in `package-directory-list'." :type 'directory + :risky t :group 'package :version "24.1") @@ -259,6 +268,7 @@ These directories contain packages intended for system-wide; in contrast, `package-user-dir' contains packages for personal use." :type '(repeat directory) + :risky t :group 'package :version "24.1") @@ -293,6 +303,7 @@ (bubbles . [(0 5) nil "Puzzle game for Emacs."]))))) "Alist of all built-in packages. Maps the package name to a vector [VERSION REQS DOCSTRING].") +(put 'package--builtins 'risky-local-variable t) (defvar package-alist package--builtins "Alist of all packages available for activation. @@ -301,15 +312,18 @@ The value is generated by `package-load-descriptor', usually called via `package-initialize'. For user customizations of which packages to load/activate, see `package-load-list'.") +(put 'package-archive-contents 'risky-local-variable t) (defvar package-activated-list (mapcar #'car package-alist) "List of the names of currently activated packages.") +(put 'package-activated-list 'risky-local-variable t) (defvar package-obsolete-alist nil "Representation of obsolete packages. Like `package-alist', but maps package name to a second alist. The inner alist is keyed by version.") +(put 'package-obsolete-alist 'risky-local-variable t) (defconst package-subdirectory-regexp "^\\([^.].*\\)-\\([0-9]+\\(?:[.][0-9]+\\)*\\)$" @@ -361,16 +375,14 @@ (match-string 1 dirname))) (defun package-load-descriptor (dir package) - "Load the description file for a package. -DIR is the directory in which to find the package subdirectory, -and PACKAGE is the name of the package subdirectory. -Return nil if the package could not be found." - (let ((pkg-dir (expand-file-name package dir))) - (if (file-directory-p pkg-dir) - (load (expand-file-name (concat (package-strip-version package) - "-pkg") - pkg-dir) - nil t)))) + "Load the description file in directory DIR for package PACKAGE." + (let* ((pkg-dir (expand-file-name package dir)) + (pkg-file (expand-file-name + (concat (package-strip-version package) "-pkg") + pkg-dir))) + (when (and (file-directory-p pkg-dir) + (file-exists-p (concat pkg-file ".el"))) + (load pkg-file nil t)))) (defun package-load-all-descriptors () "Load descriptors for installed Emacs Lisp packages. @@ -613,20 +625,23 @@ (let ((load-path (cons pkg-dir load-path))) (byte-recompile-directory pkg-dir 0 t))))) +(defun package--write-file-no-coding (file-name excl) + (let ((buffer-file-coding-system 'no-conversion)) + (write-region (point-min) (point-max) file-name nil nil nil excl))) + (defun package-unpack-single (file-name version desc requires) "Install the contents of the current buffer as a package." ;; Special case "package". (if (string= file-name "package") - (write-region (point-min) (point-max) - (expand-file-name (concat file-name ".el") - package-user-dir) - nil nil nil nil) + (package--write-file-no-coding + (expand-file-name (concat file-name ".el") package-user-dir) + nil) (let* ((pkg-dir (expand-file-name (concat file-name "-" version) package-user-dir)) (el-file (expand-file-name (concat file-name ".el") pkg-dir)) (pkg-file (expand-file-name (concat file-name "-pkg.el") pkg-dir))) (make-directory pkg-dir t) - (write-region (point-min) (point-max) el-file nil nil nil 'excl) + (package--write-file-no-coding el-file 'excl) (let ((print-level nil) (print-length nil)) (write-region @@ -670,7 +685,7 @@ (defun package-download-single (name version desc requires) "Download and install a single-file package." (let ((buffer (url-retrieve-synchronously - (concat package-archive-base + (concat (package-archive-id name) (symbol-name name) "-" version ".el")))) (with-current-buffer buffer (package-handle-response) @@ -683,7 +698,7 @@ (defun package-download-tar (name version) "Download and install a tar package." (let ((tar-buffer (url-retrieve-synchronously - (concat package-archive-base + (concat (package-archive-id name) (symbol-name name) "-" version ".tar")))) (with-current-buffer tar-buffer (package-handle-response) @@ -692,12 +707,12 @@ (package-unpack name version) (kill-buffer tar-buffer)))) -(defun package-installed-p (package version) +(defun package-installed-p (package &optional min-version) (let ((pkg-desc (assq package package-alist))) (and pkg-desc - (package-version-compare version + (package-version-compare min-version (package-desc-vers (cdr pkg-desc)) - '>=)))) + '<=)))) (defun package-compute-transaction (result requirements) (dolist (elt requirements) @@ -772,16 +787,13 @@ (car contents) package-archive-version)) (cdr contents)))))) -(defun package-read-archive-contents () +(defun package-read-all-archive-contents () "Re-read `archive-contents' and `builtin-packages', if they exist. Set `package-archive-contents' and `package--builtins' if successful. Throw an error if the archive version is too new." - (let ((archive-contents (package--read-archive-file "archive-contents")) - (builtins (package--read-archive-file "builtin-packages"))) - (if archive-contents - ;; Version 1 of 'archive-contents' is identical to our - ;; internal representation. - (setq package-archive-contents archive-contents)) + (dolist (archive package-archives) + (package-read-archive-contents (car archive))) + (let ((builtins (package--read-archive-file "builtin-packages"))) (if builtins ;; Version 1 of 'builtin-packages' is a list where the car is ;; a split emacs version and the cdr is an alist suitable for @@ -793,6 +805,33 @@ (if (package-version-compare our-version (car elt) '>=) (setq result (append (cdr elt) result))))))))) +(defun package-read-archive-contents (archive) + "Re-read `archive-contents' and `builtin-packages' for ARCHIVE. +If successful, set `package-archive-contents' and `package--builtins'. +If the archive version is too new, signal an error." + (let ((archive-contents (package--read-archive-file + (concat "archives/" archive + "/archive-contents")))) + (if archive-contents + ;; Version 1 of 'archive-contents' is identical to our + ;; internal representation. + ;; TODO: merge archive lists + (dolist (package archive-contents) + (package--add-to-archive-contents package archive))))) + +(defun package--add-to-archive-contents (package archive) + "Add the PACKAGE from the given ARCHIVE if necessary. +Also, add the originating archive to the end of the package vector." + (let* ((name (car package)) + (version (aref (cdr package) 0)) + (entry (cons (car package) + (vconcat (cdr package) (vector archive)))) + (existing-package (cdr (assq name package-archive-contents)))) + (when (or (not existing-package) + (package-version-compare version + (aref existing-package 0) '>)) + (add-to-list 'package-archive-contents entry)))) + (defun package-download-transaction (transaction) "Download and install all the packages in the given transaction." (dolist (elt transaction) @@ -817,26 +856,21 @@ (defun package-install (name) "Install the package named NAME. Interactively, prompt for the package name. -The package is found on the archive site, see `package-archive-base'." +The package is found on one of the archives in `package-archive-base'." (interactive - (list (progn - ;; Make sure we're using the most recent download of the - ;; archive. Maybe we should be updating the archive first? - (package-read-archive-contents) - (intern (completing-read "Install package: " - (mapcar (lambda (elt) - (cons (symbol-name (car elt)) - nil)) - package-archive-contents) - nil t))))) + (list (intern (completing-read "Install package: " + (mapcar (lambda (elt) + (cons (symbol-name (car elt)) + nil)) + package-archive-contents) + nil t)))) (let ((pkg-desc (assq name package-archive-contents))) (unless pkg-desc - (error "Package '%s' not available for installation" + (error "Package '%s' is not available for installation" (symbol-name name))) - (let ((transaction - (package-compute-transaction (list name) - (package-desc-reqs (cdr pkg-desc))))) - (package-download-transaction transaction))) + (package-download-transaction + (package-compute-transaction (list name) + (package-desc-reqs (cdr pkg-desc))))) ;; Try to activate it. (package-initialize)) @@ -996,20 +1030,28 @@ ;; FIXME: query user? 'always)) -(defun package--download-one-archive (file) - "Download a single archive file and cache it locally." - (let ((buffer (url-retrieve-synchronously - (concat package-archive-base file)))) +(defun package-archive-id (name) + "Return the archive containing the package NAME." + (let ((desc (cdr (assq (intern-soft name) package-archive-contents)))) + (cdr (assoc (aref desc (- (length desc) 1)) package-archives)))) + +(defun package--download-one-archive (archive file) + "Download an archive file FILE from ARCHIVE, and cache it locally." + (let* ((archive-name (car archive)) + (archive-url (cdr archive)) + (dir (expand-file-name "archives" package-user-dir)) + (dir (expand-file-name archive-name dir)) + (buffer (url-retrieve-synchronously (concat archive-url file)))) (with-current-buffer buffer (package-handle-response) (re-search-forward "^$" nil 'move) (forward-char) (delete-region (point-min) (point)) - (setq buffer-file-name (concat (file-name-as-directory package-user-dir) - file)) + (make-directory dir t) + (setq buffer-file-name (expand-file-name file dir)) (let ((version-control 'never)) - (save-buffer)) - (kill-buffer buffer)))) + (save-buffer))) + (kill-buffer buffer))) (defun package-refresh-contents () "Download the ELPA archive description if needed. @@ -1019,9 +1061,9 @@ (interactive) (unless (file-exists-p package-user-dir) (make-directory package-user-dir t)) - (package--download-one-archive "archive-contents") - (package--download-one-archive "builtin-packages") - (package-read-archive-contents)) + (dolist (archive package-archives) + (package--download-one-archive archive "archive-contents")) + (package-read-all-archive-contents)) ;;;###autoload (defun package-initialize () @@ -1030,7 +1072,7 @@ (interactive) (setq package-obsolete-alist nil) (package-load-all-descriptors) - (package-read-archive-contents) + (package-read-all-archive-contents) ;; Try to activate all our packages. (mapc (lambda (elt) (package-activate (car elt) (package-desc-vers (cdr elt)))) @@ -1306,11 +1348,12 @@ For single-file packages, shows the commentary section from the header. For larger packages, shows the README file." (interactive) - (let* (start-point ok - (pkg-name (package-menu-get-package)) - (buffer (url-retrieve-synchronously (concat package-archive-base - pkg-name - "-readme.txt")))) + (let* ((pkg-name (package-menu-get-package)) + (buffer (url-retrieve-synchronously + (concat (package-archive-id pkg-name) + pkg-name + "-readme.txt"))) + start-point ok) (with-current-buffer buffer ;; FIXME: it would be nice to work with any URL type. (setq start-point url-http-end-of-headers) @@ -1322,7 +1365,7 @@ (insert "Package information for " pkg-name "\n\n") (if ok (insert-buffer-substring buffer start-point) - (insert "This package does not have a README file or commentary comment.\n")) + (insert "This package lacks a README file or commentary.\n")) (goto-char (point-min)) (view-mode))) (display-buffer new-buffer t)))) @@ -1355,7 +1398,6 @@ Emacs." (interactive) (goto-char (point-min)) - (forward-line 2) (while (not (eobp)) (let ((cmd (char-after)) (pkg-name (package-menu-get-package)) ------------------------------------------------------------ revno: 100924 committer: Jan D. branch nick: trunk timestamp: Wed 2010-07-28 19:34:51 +0200 message: Add tool bar style text-image-horiz (text to the left of the image). * lisp/cus-start.el (tool-bar-style): Add text-image-horiz. * src/gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar style text_image_horiz. * src/lisp.h (Qtext_image_horiz): Declare. * src/xdisp.c (Qtext_image_horiz): Define. (syms_of_xdisp): Initialize Qtext_image_horiz. Add text-image-horiz to ducumentation of tool-bar-style. * src/xsettings.c (Ftool_bar_get_system_style): Also check for Qtext_image_horiz. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-28 10:08:16 +0000 +++ lisp/ChangeLog 2010-07-28 17:34:51 +0000 @@ -1,3 +1,7 @@ +2010-07-28 Jan Djärv + + * cus-start.el (tool-bar-style): Add text-image-horiz. + 2010-07-28 Michael Albinus * progmodes/gud.el (gud-common-init): Check for remoteness of === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2010-05-07 13:52:25 +0000 +++ lisp/cus-start.el 2010-07-28 17:34:51 +0000 @@ -345,6 +345,7 @@ (const :tag "Text" :value text) (const :tag "Both" :value both) (const :tag "Both-horiz" :value both-horiz) + (const :tag "Text-image-horiz" :value text-image-horiz) (const :tag "System default" :value nil)) "23.3") (tool-bar-max-label-size frames integer "23.3") === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-27 08:02:44 +0000 +++ src/ChangeLog 2010-07-28 17:34:51 +0000 @@ -1,3 +1,17 @@ +2010-07-28 Jan Djärv + + * xsettings.c (Ftool_bar_get_system_style): Also check for + Qtext_image_horiz. + + * xdisp.c (Qtext_image_horiz): Define. + (syms_of_xdisp): Initialize Qtext_image_horiz. Add text-image-horiz + to ducumentation of tool-bar-style. + + * lisp.h (Qtext_image_horiz): Declare. + + * gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar + style text_image_horiz. + 2010-07-27 Dan Nicolaescu * emacs.c (Fkill_emacs): Remove return statement. === modified file 'src/gtkutil.c' --- src/gtkutil.c 2010-07-17 16:03:16 +0000 +++ src/gtkutil.c 2010-07-28 17:34:51 +0000 @@ -3703,8 +3703,7 @@ gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar"); gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS); - toolbar_set_orientation (x->toolbar_widget, - GTK_ORIENTATION_HORIZONTAL); + toolbar_set_orientation (x->toolbar_widget, GTK_ORIENTATION_HORIZONTAL); } @@ -3749,15 +3748,23 @@ int i) { GtkToolItem *ti = gtk_tool_item_new (); - GtkWidget *vb = EQ (Vtool_bar_style, Qboth_horiz) + Lisp_Object style = Ftool_bar_get_system_style (); + int both_horiz = EQ (style, Qboth_horiz); + int text_image = EQ (style, Qtext_image_horiz); + + GtkWidget *vb = both_horiz || text_image ? gtk_hbox_new (FALSE, 0) : gtk_vbox_new (FALSE, 0); GtkWidget *wb = gtk_button_new (); GtkWidget *weventbox = gtk_event_box_new (); - if (wimage) + if (wimage && ! text_image) gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vb), gtk_label_new (label), TRUE, TRUE, 0); + + if (wimage && text_image) + gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0); + gtk_button_set_focus_on_click (GTK_BUTTON (wb), FALSE); gtk_button_set_relief (GTK_BUTTON (wb), GTK_RELIEF_NONE); gtk_container_add (GTK_CONTAINER (wb), vb); @@ -3819,11 +3826,12 @@ xg_show_toolbar_item (GtkToolItem *ti) { Lisp_Object style = Ftool_bar_get_system_style (); + int both_horiz = EQ (style, Qboth_horiz); + int text_image = EQ (style, Qtext_image_horiz); - int show_label = EQ (style, Qboth) - || EQ (style, Qboth_horiz) || EQ (style, Qtext); + int horiz = both_horiz || text_image; + int show_label = ! EQ (style, Qimage); int show_image = ! EQ (style, Qtext); - int horiz = EQ (style, Qboth_horiz); GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (ti)); GtkWidget *wbutton = gtk_bin_get_child (GTK_BIN (weventbox)); @@ -3836,15 +3844,21 @@ new_box = gtk_hbox_new (FALSE, 0); else if (GTK_IS_HBOX (vb) && !horiz && show_label && show_image) new_box = gtk_vbox_new (FALSE, 0); - if (new_box) + + if (!new_box && horiz) + gtk_box_reorder_child (GTK_BOX (vb), wlbl, text_image ? 0 : 1); + else if (new_box) { g_object_ref (G_OBJECT (wimage)); g_object_ref (G_OBJECT (wlbl)); gtk_container_remove (GTK_CONTAINER (vb), wimage); gtk_container_remove (GTK_CONTAINER (vb), wlbl); gtk_widget_destroy (GTK_WIDGET (vb)); - gtk_box_pack_start (GTK_BOX (new_box), wimage, TRUE, TRUE, 0); + if (! text_image) + gtk_box_pack_start (GTK_BOX (new_box), wimage, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (new_box), wlbl, TRUE, TRUE, 0); + if (text_image) + gtk_box_pack_start (GTK_BOX (new_box), wimage, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (wbutton), new_box); g_object_unref (G_OBJECT (wimage)); g_object_unref (G_OBJECT (wlbl)); === modified file 'src/lisp.h' --- src/lisp.h 2010-07-27 02:45:53 +0000 +++ src/lisp.h 2010-07-28 17:34:51 +0000 @@ -2631,7 +2631,7 @@ extern Lisp_Object Qinhibit_redisplay, Qdisplay; extern Lisp_Object Qinhibit_eval_during_redisplay; extern Lisp_Object Qmessage_truncate_lines; -extern Lisp_Object Qimage, Qtext, Qboth, Qboth_horiz; +extern Lisp_Object Qimage, Qtext, Qboth, Qboth_horiz, Qtext_image_horiz; extern Lisp_Object Qspace, Qcenter, QCalign_to; extern Lisp_Object Vmessage_log_max; extern Lisp_Object QCdata, QCfile; === modified file 'src/xdisp.c' --- src/xdisp.c 2010-07-27 03:52:35 +0000 +++ src/xdisp.c 2010-07-28 17:34:51 +0000 @@ -456,7 +456,7 @@ Lisp_Object Qrect, Qcircle, Qpoly; /* Tool bar styles */ -Lisp_Object Qtext, Qboth, Qboth_horiz; +Lisp_Object Qtext, Qboth, Qboth_horiz, Qtext_image_horiz; /* Non-zero means print newline to stdout before next mini-buffer message. */ @@ -25636,6 +25636,8 @@ staticpro (&Qboth); Qboth_horiz = intern_c_string ("both-horiz"); staticpro (&Qboth_horiz); + Qtext_image_horiz = intern_c_string ("text-image-horiz"); + staticpro (&Qtext_image_horiz); QCmap = intern_c_string (":map"); staticpro (&QCmap); QCpointer = intern_c_string (":pointer"); @@ -25979,11 +25981,12 @@ DEFVAR_LISP ("tool-bar-style", &Vtool_bar_style, doc: /* *Tool bar style to use. It can be one of - image - show images only - text - show text only - both - show both, text under image - both-horiz - show text to the right of the image - any other - use system default or image if no system default. */); + image - show images only + text - show text only + both - show both, text below image + both-horiz - show text to the right of the image + text-image-horiz - show text to the left of the image + any other - use system default or image if no system default. */); Vtool_bar_style = Qnil; DEFVAR_INT ("tool-bar-max-label-size", &tool_bar_max_label_size, === modified file 'src/xsettings.c' --- src/xsettings.c 2010-07-08 21:25:08 +0000 +++ src/xsettings.c 2010-07-28 17:34:51 +0000 @@ -730,7 +730,8 @@ if (EQ (Vtool_bar_style, Qimage) || EQ (Vtool_bar_style, Qtext) || EQ (Vtool_bar_style, Qboth) - || EQ (Vtool_bar_style, Qboth_horiz)) + || EQ (Vtool_bar_style, Qboth_horiz) + || EQ (Vtool_bar_style, Qtext_image_horiz)) return Vtool_bar_style; if (!NILP (current_tool_bar_style)) return current_tool_bar_style; ------------------------------------------------------------ revno: 100923 committer: Michael Albinus branch nick: trunk timestamp: Wed 2010-07-28 12:25:38 +0200 message: * tramp.texi (Traces and Profiles): Describe verbose level 9. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-07-27 02:10:05 +0000 +++ doc/misc/ChangeLog 2010-07-28 10:25:38 +0000 @@ -1,3 +1,7 @@ +2010-07-28 Michael Albinus + + * tramp.texi (Traces and Profiles): Describe verbose level 9. + 2010-07-27 Chong Yidong * nxml-mode.texi (Limitations): Remove obsolete discussion (Bug#6708). === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2010-07-17 09:42:59 +0000 +++ doc/misc/tramp.texi 2010-07-28 10:25:38 +0000 @@ -3501,6 +3501,7 @@ @*@indent @w{ 6} sent and received strings @*@indent @w{ 7} file caching @*@indent @w{ 8} connection properties +@*@indent @w{ 9} test commands @*@indent @w{10} traces (huge) When @code{tramp-verbose} is greater than or equal to 4, the messages ------------------------------------------------------------ revno: 100922 committer: Michael Albinus branch nick: trunk timestamp: Wed 2010-07-28 12:08:16 +0200 message: * progmodes/gud.el (gud-common-init): Check for remoteness of `file', and not of `default-directory'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-28 10:02:18 +0000 +++ lisp/ChangeLog 2010-07-28 10:08:16 +0000 @@ -1,5 +1,10 @@ 2010-07-28 Michael Albinus + * progmodes/gud.el (gud-common-init): Check for remoteness of + `file', and not of `default-directory'. + +2010-07-28 Michael Albinus + * net/tramp.el (tramp-methods): Move hostname to the end in all ssh `tramp-login-args'. (tramp-verbose): Describe verbose level 9. === modified file 'lisp/progmodes/gud.el' --- lisp/progmodes/gud.el 2010-03-27 13:27:43 +0000 +++ lisp/progmodes/gud.el 2010-07-28 10:08:16 +0000 @@ -145,7 +145,7 @@ (gud-call "suspend")) ((eq gud-minor-mode 'gdbmi) (gud-call (gdb-gud-context-command "-exec-interrupt"))) - (t + (t (comint-interrupt-subjob))))) (easy-mmode-defmap gud-menu-map @@ -2513,7 +2513,7 @@ (setq w (cdr w))) (if w (setcar w - (if (file-remote-p default-directory) + (if (file-remote-p file) ;; Tramp has already been loaded if we are here. (setq file (tramp-file-name-localname (tramp-dissect-file-name file))) ------------------------------------------------------------ revno: 100921 committer: Michael Albinus branch nick: trunk timestamp: Wed 2010-07-28 12:02:18 +0200 message: * net/tramp.el (tramp-methods): Move hostname to the end in all ssh `tramp-login-args'. (tramp-verbose): Describe verbose level 9. (tramp-open-shell): Check for tty if `tramp-verbose' >= 9. (tramp-open-connection-setup-interactive-shell): Trace stty settings if `tramp-verbose' >= 9. (tramp-handle-start-file-process): Implement tty setting. (Bug#4604, Bug#6360) * net/tramp-cmds.el (tramp-bug): Recommend setting of `tramp-verbose' to 9. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-27 23:38:46 +0000 +++ lisp/ChangeLog 2010-07-28 10:02:18 +0000 @@ -1,3 +1,17 @@ +2010-07-28 Michael Albinus + + * net/tramp.el (tramp-methods): Move hostname to the end in all + ssh `tramp-login-args'. + (tramp-verbose): Describe verbose level 9. + (tramp-open-shell): Check for tty if `tramp-verbose' >= 9. + (tramp-open-connection-setup-interactive-shell): Trace stty + settings if `tramp-verbose' >= 9. + (tramp-handle-start-file-process): Implement tty setting. + (Bug#4604, Bug#6360) + + * net/tramp-cmds.el (tramp-bug): Recommend setting of + `tramp-verbose' to 9. + 2010-07-27 Aaron S. Hawley * emacs-lisp/re-builder.el (reb-re-syntax, reb-lisp-mode) === modified file 'lisp/net/tramp-cmds.el' --- lisp/net/tramp-cmds.el 2010-05-09 19:57:55 +0000 +++ lisp/net/tramp-cmds.el 2010-07-28 10:02:18 +0000 @@ -225,7 +225,7 @@ This allows to investigate from a clean environment. Another useful thing to do is to put - (setq tramp-verbose 8) + (setq tramp-verbose 9) in the ~/.emacs file and to repeat the bug. Then, include the contents of the *tramp/foo* buffer and the *debug tramp/foo* === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-07-23 13:58:52 +0000 +++ lisp/net/tramp.el 2010-07-28 10:02:18 +0000 @@ -200,6 +200,7 @@ 6 sent and received strings 7 file caching 8 connection properties + 9 test commands 10 traces (huge)." :group 'tramp :type 'integer) @@ -332,8 +333,8 @@ (tramp-copy-recursive t) (tramp-password-end-of-line nil)) ("scp" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-e" "none"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "scp") @@ -348,8 +349,8 @@ ("-o" "StrictHostKeyChecking=no"))) (tramp-default-port 22)) ("scp1" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-1" "-e" "none"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-1") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "scp") @@ -364,8 +365,8 @@ ("-o" "StrictHostKeyChecking=no"))) (tramp-default-port 22)) ("scp2" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-2" "-e" "none"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-2") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "scp") @@ -400,8 +401,8 @@ (tramp-copy-recursive t) (tramp-password-end-of-line nil)) ("sftp" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-e" "none"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "sftp") @@ -409,8 +410,8 @@ (tramp-copy-keep-date nil) (tramp-password-end-of-line nil)) ("rsync" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-e" "none"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "rsync") @@ -421,10 +422,10 @@ (tramp-password-end-of-line nil)) ("rsyncc" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") + (tramp-login-args (("-l" "%u") ("-p" "%p") ("-o" "ControlPath=%t.%%r@%%h:%%p") ("-o" "ControlMaster=yes") - ("-e" "none"))) + ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "rsync") @@ -453,8 +454,8 @@ (tramp-copy-keep-date nil) (tramp-password-end-of-line nil)) ("ssh" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-e" "none"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program nil) @@ -467,8 +468,8 @@ ("-o" "StrictHostKeyChecking=no"))) (tramp-default-port 22)) ("ssh1" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-1" "-e" "none"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-1") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program nil) @@ -481,8 +482,8 @@ ("-o" "StrictHostKeyChecking=no"))) (tramp-default-port 22)) ("ssh2" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-2" "-e" "none"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-2") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program nil) @@ -545,10 +546,10 @@ (tramp-copy-keep-date nil) (tramp-password-end-of-line nil)) ("scpc" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") + (tramp-login-args (("-l" "%u") ("-p" "%p") ("-o" "ControlPath=%t.%%r@%%h:%%p") ("-o" "ControlMaster=yes") - ("-e" "none"))) + ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "scp") @@ -563,8 +564,9 @@ ("-o" "StrictHostKeyChecking=no"))) (tramp-default-port 22)) ("scpx" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-e" "none" "-t" "-t" "/bin/sh"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-e" "none") ("-t" "-t") + ("%h") ("/bin/sh"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "scp") @@ -577,8 +579,9 @@ ("-o" "StrictHostKeyChecking=no"))) (tramp-default-port 22)) ("sshx" (tramp-login-program "ssh") - (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") - ("-e" "none" "-t" "-t" "/bin/sh"))) + (tramp-login-args (("-l" "%u") ("-p" "%p") + ("-e" "none") ("-t" "-t") + ("%h") ("/bin/sh"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program nil) @@ -4506,14 +4509,16 @@ (defun tramp-handle-start-file-process (name buffer program &rest args) "Like `start-file-process' for Tramp files." (with-parsed-tramp-file-name default-directory nil - (unless (stringp program) - (tramp-error - v 'file-error "pty association is not supported for `%s'" name)) (unwind-protect - (let ((command (format "cd %s; exec %s" - (tramp-shell-quote-argument localname) - (mapconcat 'tramp-shell-quote-argument - (cons program args) " "))) + ;; When PROGRAM is nil, we just provide a tty. + (let ((command + (when (stringp program) + (format "cd %s; exec %s" + (tramp-shell-quote-argument localname) + (mapconcat 'tramp-shell-quote-argument + (cons program args) " ")))) + (tramp-process-connection-type + (or (null program) tramp-process-connection-type)) (name1 name) (i 0)) (unless buffer @@ -4533,9 +4538,16 @@ (with-current-buffer (tramp-get-connection-buffer v) (clear-visited-file-modtime) (narrow-to-region (point-max) (point-max))) - ;; Send the command. `tramp-send-command' opens a new - ;; connection. - (tramp-send-command v command nil t) ; nooutput + (if (stringp program) + ;; Send the command. `tramp-send-command' opens a new + ;; connection. + (tramp-send-command v command nil t) ; nooutput + ;; Check, whether a pty is associated, and set it as + ;; process property. + (condition-case nil + (tramp-send-command-and-read v "echo \\\"`tty`\\\"") + (tramp-error + v 'file-error "pty association is not supported for `%s'" name))) ;; Set query flag for this process. (tramp-set-process-query-on-exit-flag (tramp-get-connection-process v) t) @@ -6619,7 +6631,10 @@ vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t) (tramp-send-command vec "PS2=''" t) (tramp-send-command vec "PS3=''" t) - (tramp-send-command vec "PROMPT_COMMAND=''" t))) + (tramp-send-command vec "PROMPT_COMMAND=''" t) + ;; Dump tty in the traces. + (when (>= tramp-verbose 9) + (tramp-send-command vec "tty" t)))) (defun tramp-find-shell (vec) "Opens a shell on the remote host which groks tilde expansion." @@ -6984,7 +6999,7 @@ ;; stty, instead. (tramp-send-command vec "stty -onlcr" t)))) ;; Dump stty settings in the traces. - (when (>= tramp-verbose 10) + (when (>= tramp-verbose 9) (tramp-send-command vec "stty -a" t)) (tramp-send-command vec "set +o vi +o emacs" t) @@ -8950,7 +8965,6 @@ ;; rsync). ;; * Keep a second connection open for out-of-band methods like scp or ;; rsync. -;; * Support ptys in `tramp-handle-start-file-process'. (Bug#4604, Bug#6360) ;; * IMHO, it's a drawback that currently Tramp doesn't support ;; Unicode in Dired file names by default. Is it possible to ;; improve Tramp to set LC_ALL to "C" only for commands where Tramp ------------------------------------------------------------ revno: 100920 author: Aaron S. Hawley committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2010-07-28 01:38:46 +0200 message: * emacs-lisp/re-builder.el: Remove references to package `lisp-re' (bug#4369). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-27 16:37:25 +0000 +++ lisp/ChangeLog 2010-07-27 23:38:46 +0000 @@ -1,3 +1,9 @@ +2010-07-27 Aaron S. Hawley + + * emacs-lisp/re-builder.el (reb-re-syntax, reb-lisp-mode) + (reb-lisp-syntax-p, reb-change-syntax, reb-cook-regexp): + Remove references to package `lisp-re' (bug#4369). + 2010-07-27 Tom Tromey * progmodes/js.el (js-mode): === modified file 'lisp/emacs-lisp/re-builder.el' --- lisp/emacs-lisp/re-builder.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/re-builder.el 2010-07-27 23:38:46 +0000 @@ -61,14 +61,12 @@ ;; this limit allowing an easy way to see all matches. ;; Currently `re-builder' understands five different forms of input, -;; namely `read', `string', `rx', `sregex' and `lisp-re' syntax. Read +;; namely `read', `string', `rx', and `sregex' syntax. Read ;; syntax and string syntax are both delimited by `"'s and behave ;; according to their name. With the `string' syntax there's no need ;; to escape the backslashes and double quotes simplifying the editing ;; somewhat. The other three allow editing of symbolic regular -;; expressions supported by the packages of the same name. (`lisp-re' -;; is a package by me and its support may go away as it is nearly the -;; same as the `sregex' package in Emacs) +;; expressions supported by the packages of the same name. ;; Editing symbolic expressions is done through a major mode derived ;; from `emacs-lisp-mode' so you'll get all the good stuff like @@ -128,12 +126,11 @@ (defcustom reb-re-syntax 'read "Syntax for the REs in the RE Builder. -Can either be `read', `string', `sregex', `lisp-re', `rx'." +Can either be `read', `string', `sregex', or `rx'." :group 're-builder :type '(choice (const :tag "Read syntax" read) (const :tag "String syntax" string) (const :tag "`sregex' syntax" sregex) - (const :tag "`lisp-re' syntax" lisp-re) (const :tag "`rx' syntax" rx))) (defcustom reb-auto-match-limit 200 @@ -281,9 +278,8 @@ (define-derived-mode reb-lisp-mode emacs-lisp-mode "RE Builder Lisp" "Major mode for interactively building symbolic Regular Expressions." - (cond ((eq reb-re-syntax 'lisp-re) ; Pull in packages - (require 'lisp-re)) ; as needed - ((eq reb-re-syntax 'sregex) ; sregex is not autoloaded + ;; Pull in packages as needed + (cond ((eq reb-re-syntax 'sregex) ; sregex is not autoloaded (require 'sregex)) ; right now.. ((eq reb-re-syntax 'rx) ; rx-to-string is autoloaded (require 'rx))) ; require rx anyway @@ -329,7 +325,7 @@ (defsubst reb-lisp-syntax-p () "Return non-nil if RE Builder uses a Lisp syntax." - (memq reb-re-syntax '(lisp-re sregex rx))) + (memq reb-re-syntax '(sregex rx))) (defmacro reb-target-binding (symbol) "Return binding for SYMBOL in the RE Builder target buffer." @@ -489,10 +485,10 @@ (list (intern (completing-read "Select syntax: " (mapcar (lambda (el) (cons (symbol-name el) 1)) - '(read string lisp-re sregex rx)) + '(read string sregex rx)) nil t (symbol-name reb-re-syntax))))) - (if (memq syntax '(read string lisp-re sregex rx)) + (if (memq syntax '(read string sregex rx)) (let ((buffer (get-buffer reb-buffer))) (setq reb-re-syntax syntax) (when buffer @@ -616,10 +612,7 @@ (defun reb-cook-regexp (re) "Return RE after processing it according to `reb-re-syntax'." - (cond ((eq reb-re-syntax 'lisp-re) - (when (fboundp 'lre-compile-string) - (lre-compile-string (eval (car (read-from-string re)))))) - ((eq reb-re-syntax 'sregex) + (cond ((eq reb-re-syntax 'sregex) (apply 'sregex (eval (car (read-from-string re))))) ((eq reb-re-syntax 'rx) (rx-to-string (eval (car (read-from-string re)))))