------------------------------------------------------------ revno: 116642 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2014-03-03 12:27:58 +0400 message: Avoid crashes when X fonts are erroneously freed on reused X 'Display *' connection data (Bug#16069). Note that X font resources still may be leaked, but currently there is no way to completely avoid it. * xterm.h (struct x_display_info): New member x_id. Add comments. * xterm.c (x_display_id): New variable. (x_term_init): Assign identifier to each opened X connection. * xfont.c (struct xfont): New member x_display_id. (xfont_open): Initialize it with frame's display id. (xfont_close): Check whether font's display id matches the one recorded for the given display. Adjust comment. * xftfont.c (struct xftfont_info): (xftfont_open, xftfont_close): Exactly as above with xfont stuff. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-03 07:46:08 +0000 +++ src/ChangeLog 2014-03-03 08:27:58 +0000 @@ -6,6 +6,20 @@ (Fframe_font_cache) [FONT_DEBUG]: New function. (syms_of_font) [FONT_DEBUG]: Defsubr it. + Avoid crashes when X fonts are erroneously freed on reused X + 'Display *' connection data (Bug#16069). Note that X font + resources still may be leaked, but currently there is no way + to completely avoid it. + * xterm.h (struct x_display_info): New member x_id. Add comments. + * xterm.c (x_display_id): New variable. + (x_term_init): Assign identifier to each opened X connection. + * xfont.c (struct xfont): New member x_display_id. + (xfont_open): Initialize it with frame's display id. + (xfont_close): Check whether font's display id matches the one + recorded for the given display. Adjust comment. + * xftfont.c (struct xftfont_info): + (xftfont_open, xftfont_close): Exactly as above with xfont stuff. + 2014-03-01 Martin Rudalics Consider Vother_window_scroll_buffer valid iff it's a live buffer. === modified file 'src/xfont.c' --- src/xfont.c 2014-01-01 07:43:34 +0000 +++ src/xfont.c 2014-03-03 08:27:58 +0000 @@ -42,6 +42,7 @@ struct font font; Display *display; XFontStruct *xfont; + unsigned x_display_id; }; /* Prototypes of support functions. */ @@ -808,6 +809,7 @@ font = XFONT_OBJECT (font_object); ((struct xfont_info *) font)->xfont = xfont; ((struct xfont_info *) font)->display = FRAME_X_DISPLAY (f); + ((struct xfont_info *) font)->x_display_id = FRAME_DISPLAY_INFO (f)->x_id; font->pixel_size = pixel_size; font->driver = &xfont_driver; font->encoding_charset = encoding->id; @@ -892,12 +894,20 @@ static void xfont_close (struct font *font) { + struct x_display_info *xdi; struct xfont_info *xfi = (struct xfont_info *) font; /* This function may be called from GC when X connection is gone (Bug#16093), and an attempt to free font resources on invalid - display may lead to X protocol errors or segfaults. */ - if (xfi->xfont && x_display_info_for_display (xfi->display)) + display may lead to X protocol errors or segfaults. Moreover, + the memory referenced by 'Display *' pointer may be reused for + the logically different X connection after the previous display + connection was closed. That's why we also check whether font's + ID matches the one recorded in x_display_info for this display. + See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16069. */ + if (xfi->xfont + && ((xdi = x_display_info_for_display (xfi->display)) + && xfi->x_display_id == xdi->x_id)) { block_input (); XFreeFont (xfi->display, xfi->xfont); === modified file 'src/xftfont.c' --- src/xftfont.c 2014-01-06 06:25:30 +0000 +++ src/xftfont.c 2014-03-03 08:27:58 +0000 @@ -59,6 +59,7 @@ FT_Matrix matrix; Display *display; XftFont *xftfont; + unsigned x_display_id; }; /* Structure pointed by (struct face *)->extra */ @@ -372,6 +373,7 @@ xftfont_info = (struct xftfont_info *) font; xftfont_info->display = display; xftfont_info->xftfont = xftfont; + xftfont_info->x_display_id = FRAME_DISPLAY_INFO (f)->x_id; /* This means that there's no need of transformation. */ xftfont_info->matrix.xx = 0; if (FcPatternGetMatrix (xftfont->pattern, FC_MATRIX, 0, &matrix) @@ -481,6 +483,7 @@ static void xftfont_close (struct font *font) { + struct x_display_info *xdi; struct xftfont_info *xftfont_info = (struct xftfont_info *) font; #ifdef HAVE_LIBOTF @@ -493,7 +496,8 @@ /* See comment in xfont_close. */ if (xftfont_info->xftfont - && x_display_info_for_display (xftfont_info->display)) + && ((xdi = x_display_info_for_display (xftfont_info->display)) + && xftfont_info->x_display_id == xdi->x_id)) { block_input (); XftUnlockFace (xftfont_info->xftfont); === modified file 'src/xterm.c' --- src/xterm.c 2014-02-04 07:36:58 +0000 +++ src/xterm.c 2014-03-03 08:27:58 +0000 @@ -9679,6 +9679,10 @@ } #endif +/* Current X display connection identifier. Incremented for each next + connection established. */ +static unsigned x_display_id; + /* Open a connection to X display DISPLAY_NAME, and return the structure that describes the open display. If we cannot contact the display, return null. */ @@ -9896,6 +9900,7 @@ lim = min (PTRDIFF_MAX, SIZE_MAX) - sizeof "@"; if (lim - SBYTES (Vinvocation_name) < SBYTES (Vsystem_name)) memory_full (SIZE_MAX); + dpyinfo->x_id = ++x_display_id; dpyinfo->x_id_name = xmalloc (SBYTES (Vinvocation_name) + SBYTES (Vsystem_name) + 2); strcat (strcat (strcpy (dpyinfo->x_id_name, SSDATA (Vinvocation_name)), "@"), === modified file 'src/xterm.h' --- src/xterm.h 2014-01-11 09:31:09 +0000 +++ src/xterm.h 2014-03-03 08:27:58 +0000 @@ -198,6 +198,10 @@ mouse-face. */ Mouse_HLInfo mouse_highlight; + /* Logical identifier of this display. */ + unsigned x_id; + + /* Default name for all frames on this display. */ char *x_id_name; /* The number of fonts opened for this display. */ ------------------------------------------------------------ revno: 116641 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2014-03-03 11:46:08 +0400 message: * font.c (toplevel): Adjust comment about font cache layout. (font_clear_cache): Fix to match real font cache layout. Suggested by in Bug#16069. (Fframe_font_cache) [FONT_DEBUG]: New function. (syms_of_font) [FONT_DEBUG]: Defsubr it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-03 04:57:26 +0000 +++ src/ChangeLog 2014-03-03 07:46:08 +0000 @@ -1,3 +1,11 @@ +2014-03-03 Dmitry Antipov + + * font.c (toplevel): Adjust comment about font cache layout. + (font_clear_cache): Fix to match real font cache layout. + Suggested by in Bug#16069. + (Fframe_font_cache) [FONT_DEBUG]: New function. + (syms_of_font) [FONT_DEBUG]: Defsubr it. + 2014-03-01 Martin Rudalics Consider Vother_window_scroll_buffer valid iff it's a live buffer. === modified file 'src/font.c' --- src/font.c 2014-02-10 22:15:54 +0000 +++ src/font.c 2014-03-03 07:46:08 +0000 @@ -2515,7 +2515,7 @@ where DRIVER-TYPE is a symbol such as `x', `xft', etc., NUM-FRAMES is a number frames sharing this cache, and FONT-CACHE-DATA is a - cons (FONT-SPEC FONT-ENTITY ...). */ + cons (FONT-SPEC . [FONT-ENTITY ...]). */ static void font_prepare_cache (struct frame *, struct font_driver *); static void font_finish_cache (struct frame *, struct font_driver *); @@ -2585,18 +2585,21 @@ font_clear_cache (struct frame *f, Lisp_Object cache, struct font_driver *driver) { Lisp_Object tail, elt; - Lisp_Object tail2, entity; + Lisp_Object entity; + ptrdiff_t i; /* CACHE = (DRIVER-TYPE NUM-FRAMES FONT-CACHE-DATA ...) */ for (tail = XCDR (XCDR (cache)); CONSP (tail); tail = XCDR (tail)) { elt = XCAR (tail); - /* elt should have the form (FONT-SPEC FONT-ENTITY ...) */ + /* elt should have the form (FONT-SPEC . [FONT-ENTITY ...]) */ if (CONSP (elt) && FONT_SPEC_P (XCAR (elt))) { - for (tail2 = XCDR (elt); CONSP (tail2); tail2 = XCDR (tail2)) + elt = XCDR (elt); + eassert (VECTORP (elt)); + for (i = 0; i < ASIZE (elt); i++) { - entity = XCAR (tail2); + entity = AREF (elt, i); if (FONT_ENTITY_P (entity) && EQ (driver->type, AREF (entity, FONT_TYPE_INDEX))) @@ -4842,6 +4845,14 @@ } #endif +DEFUN ("frame-font-cache", Fframe_font_cache, Sframe_font_cache, 0, 1, 0, + doc: /* Return FRAME's font cache. Mainly used for debugging. +If FRAME is omitted or nil, use the selected frame. */) + (Lisp_Object frame) +{ + return FRAME_DISPLAY_INFO (decode_live_frame (frame))->name_list_element; +} + #endif /* FONT_DEBUG */ #ifdef HAVE_WINDOW_SYSTEM @@ -5134,6 +5145,7 @@ #if 0 defsubr (&Sdraw_string); #endif + defsubr (&Sframe_font_cache); #endif /* FONT_DEBUG */ #ifdef HAVE_WINDOW_SYSTEM defsubr (&Sfont_info); ------------------------------------------------------------ revno: 116640 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-03-02 21:12:12 -0800 message: Spelling fixes. diff: === modified file 'doc/emacs/basic.texi' --- doc/emacs/basic.texi 2014-02-27 11:59:35 +0000 +++ doc/emacs/basic.texi 2014-03-03 05:12:12 +0000 @@ -46,12 +46,12 @@ To end a line and start a new one, type @key{RET} (@code{newline}). (The @key{RET} key may be labeled @key{Return} or @key{Enter} on your keyboard, but we refer to it as @key{RET} in this manual.) This -command inserts a newline character into the buffer, then indent -(@pxref{Indentation}) accroding to major mode. If point is at the end +command inserts a newline character into the buffer, then indents +(@pxref{Indentation}) according to the major mode. If point is at the end of the line, the effect is to create a new blank line after it and indent the new line; if point is in the middle of a line, the line is split at that position. To turn off the auto-indentation, you can -either desable Electric Indent mode (@pxref{Indent Convenience}) or +either disable Electric Indent mode (@pxref{Indent Convenience}) or type @kbd{C-j}, which inserts just a newline, without any auto-indentation. === modified file 'test/automated/tramp-tests.el' --- test/automated/tramp-tests.el 2014-02-28 08:47:43 +0000 +++ test/automated/tramp-tests.el 2014-03-03 05:12:12 +0000 @@ -869,7 +869,7 @@ (skip-unless (tramp--test-enabled)) ;; `directory-files-and-attributes' contains also values for "../". - ;; We must nesure, that this doesn't change during tests, for + ;; Ensure that this doesn't change during tests, for ;; example due to handling temporary files. (let* ((tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (expand-file-name "bla" tmp-name1)) ------------------------------------------------------------ revno: 116639 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-03-03 05:57:26 +0100 message: */ChangeLog: Trivial fixes. diff: === modified file 'ChangeLog' --- ChangeLog 2014-02-25 19:21:05 +0000 +++ ChangeLog 2014-03-03 04:57:26 +0000 @@ -1663,7 +1663,7 @@ * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/fpending.$(O) and $(BLD)/close-stream.$(O). - ($(BLD)/close-stream.$(O)): + ($(BLD)/close-stream.$(O)) ($(BLD)/fpending.$(O)): New dependencies. 2012-11-03 Paul Eggert @@ -2317,7 +2317,7 @@ * configure.ac (opsysfile): Use bsd-common on gnu systems. - * configure.ac (GNU_LIBRARY_PENDING_OUTPUT_COUNT): + * configure.ac (GNU_LIBRARY_PENDING_OUTPUT_COUNT) (SIGNALS_VIA_CHARACTERS): Move here from src/s. 2012-07-11 Paul Eggert @@ -2533,8 +2533,8 @@ 2012-06-24 Eli Zaretskii - * lib/makefile.w32-in ($(BLD)/dtotimespec.$(O)): - ($(BLD)/timespec-add.$(O)): + * lib/makefile.w32-in ($(BLD)/dtotimespec.$(O)) + ($(BLD)/timespec-add.$(O)) ($(BLD)/timespec-sub.$(O)): Don't depend on $(EMACS_ROOT)/nt/inc/sys/time.h. @@ -2554,9 +2554,9 @@ * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/dtotimespec.$(O), $(BLD)/gettime.$(O), $(BLD)/timespec-add.$(O), and $(BLD)/timespec-sub.$(O). - ($(BLD)/dtotimespec.$(O)): - ($(BLD)/gettime.$(O)): - ($(BLD)/timespec-add.$(O)): + ($(BLD)/dtotimespec.$(O)) + ($(BLD)/gettime.$(O)) + ($(BLD)/timespec-add.$(O)) ($(BLD)/timespec-sub.$(O)): New dependencies. * lib/stat-time.h: @@ -2686,9 +2686,9 @@ * config.bat (lib): Create/update lib/stdalign.in-h and lib/sys_types.in-h. - * lib/makefile.w32-in ($(BLD)/md5.$(O)): - ($(BLD)/sha1.$(O)): - ($(BLD)/sha256.$(O)): + * lib/makefile.w32-in ($(BLD)/md5.$(O)) + ($(BLD)/sha1.$(O)) + ($(BLD)/sha256.$(O)) ($(BLD)/sha512.$(O)): Depend on $(EMACS_ROOT)/nt/inc/stdalign.h. Suggested by Christoph Scholtes . @@ -4215,7 +4215,7 @@ $(BLD)/time_r.$(O). ($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and $(EMACS_ROOT)/src/m/intel386.h. - ($(BLD)/strftime.$(O)): + ($(BLD)/strftime.$(O)) ($(BLD)/time_r.$(O)): Define prerequisites. 2011-01-31 Paul Eggert @@ -4921,7 +4921,7 @@ * configure.in (HAVE_SOUND, HAVE_X_I18N, HAVE_X11R6_XIM): Set with AC_DEFINE rather than AH_BOTTOM. - * configure.in (C_OPTIMIZE_SWITCH, CANNOT_DUMP, SYSTEM_MALLOC): + * configure.in (C_OPTIMIZE_SWITCH, CANNOT_DUMP, SYSTEM_MALLOC) (USE_MMAP_FOR_BUFFERS, C_WARNING_SWITCH, CFLAGS, REAL_CFLAGS): Set with shell, not cpp. (LIBX): Remove, just use -lX11 in the one place this was used. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-02-13 02:19:48 +0000 +++ admin/ChangeLog 2014-03-03 04:57:26 +0000 @@ -64,10 +64,9 @@ 2013-12-27 Xue Fuqiao - * admin.el (manual-misc-manuals, make-manuals): - (manual-pdf, cusver-find-files): - (cusver-new-version, cusver-scan, cusver-goto-xref): - (cusver-check): Doc fix. + * admin.el (manual-misc-manuals, make-manuals, manual-pdf) + (cusver-find-files, cusver-new-version, cusver-scan) + (cusver-goto-xref, cusver-check): Doc fix. (manual-html-node, cusver-check): Use `user-error'. 2013-12-24 Paul Eggert @@ -79,9 +78,8 @@ 2013-12-24 Xue Fuqiao - * admin.el (add-release-logs): - (set-version-in-file, set-version, set-copyright): - Use `user-error'. + * admin.el (add-release-logs, set-version-in-file, set-version) + (set-copyright): Use `user-error'. 2013-12-22 Eli Zaretskii @@ -1055,7 +1053,7 @@ 2011-02-16 Paul Eggert Remove no-longer needed getloadavg symbols. - * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE): + * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE) (LDAV_SYMBOL): Remove. * notes/copyright: Remove src/getloadavg.c as a special case. === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-03-02 08:54:32 +0000 +++ doc/emacs/ChangeLog 2014-03-03 04:57:26 +0000 @@ -20,8 +20,8 @@ 2014-02-27 Xue Fuqiao - * programs.texi (Basic Indent): - (Other C Commands): Fix the description of RET and `C-j'. + * programs.texi (Basic Indent, Other C Commands): + Fix the description of RET and `C-j'. * indent.texi (Indentation Commands): Move the description of `C-j' from here... @@ -215,7 +215,7 @@ * misc.texi (Shell Mode): Move documentation of shell-completion-fignore from Shell Mode to Shell Options. -2013-12-26 João Távora +2013-12-26 João Távora * emacs.texi (Matching): Describe new features of Electric Pair mode. @@ -253,8 +253,8 @@ 2013-12-22 Xue Fuqiao - * search.texi (Special Isearch): - (Query Replace): Document negative argument of replacement commands. + * search.texi (Special Isearch, Query Replace): Document negative + argument of replacement commands. (Symbol Search): Document `isearch-forward-symbol-at-point'. * files.texi (File Conveniences): Document `image-next-file' and @@ -402,8 +402,7 @@ 2013-09-22 Xue Fuqiao - * fixit.texi (Transpose): - (Fixing Case): Remove @refill. + * fixit.texi (Transpose, Fixing Case): Remove @refill. 2013-09-21 Xue Fuqiao @@ -2646,7 +2645,7 @@ 2011-05-22 Chong Yidong - * mule.texi (Specify Coding, Text Coding, Communication Coding): + * mule.texi (Specify Coding, Text Coding, Communication Coding) (File Name Coding, Terminal Coding): Add command names (Bug#8312). 2011-05-18 Glenn Morris === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-03-02 17:49:02 +0000 +++ doc/lispref/ChangeLog 2014-03-03 04:57:26 +0000 @@ -1,4 +1,4 @@ -2014-03-02 Barry O'Reilly +2014-03-02 Barry O'Reilly * markers.texi (Moving Marker Positions): Clarify guidance about when to move markers and when to create a new one, as discussed at @@ -15,14 +15,14 @@ 2014-02-28 Xue Fuqiao - * functions.texi (Advising Functions): - (Advising Named Functions): Tweak markup. + * functions.texi (Advising Functions, Advising Named Functions): + Tweak markup. * display.texi (Defining Faces): Doc fix for `face-spec-set'. * elisp.texi (Top): - * commands.texi (Generic Commands): - (Defining Commands): Document `define-alternatives'. + * commands.texi (Generic Commands, Defining Commands): + Document `define-alternatives'. 2014-02-27 Xue Fuqiao @@ -467,8 +467,8 @@ 2013-11-17 Xue Fuqiao - * os.texi (Time Parsing): - (Processor Run Time, Input Modes, Terminal Output): Minor fixes. + * os.texi (Time Parsing, Processor Run Time, Input Modes) + (Terminal Output): Minor fixes. 2013-11-14 Glenn Morris @@ -609,8 +609,7 @@ 2013-10-03 Xue Fuqiao - * syntax.texi (Syntax Flags): - (Syntax Table Functions): Add indexes. + * syntax.texi (Syntax Flags, Syntax Table Functions): Add indexes. 2013-10-02 Xue Fuqiao @@ -692,8 +691,8 @@ (Undo): Doc fix for `buffer-undo-list'. * positions.texi (Character Motion): - * markers.texi (Moving Markers): - (Creating Markers): Comment out undefined behavior. + * markers.texi (Moving Markers, Creating Markers): + Comment out undefined behavior. 2013-08-15 Xue Fuqiao @@ -940,7 +939,7 @@ 2013-04-21 Xue Fuqiao * internals.texi (Writing Emacs Primitives): Remove unnecessary - references to the sources. (Bug#13800) + references to the sources. (Bug#13800) * searching.texi (Regexp Backslash): Doc fix for backslash constructs in regular expressions. @@ -1173,7 +1172,7 @@ 2012-12-14 Paul Eggert - Fix permissions bugs with setgid directories etc. (Bug#13125) + Fix permissions bugs with setgid directories etc. (Bug#13125) * files.texi (Testing Accessibility): Document GROUP arg of file-ownership-preserved-p. (File Attributes): Document that 9th element is now @@ -1808,7 +1807,7 @@ 2012-07-06 Richard Stallman - * intro.texi (Evaluation Notation, A Sample Function Description): + * intro.texi (Evaluation Notation, A Sample Function Description) (A Sample Variable Description): Improve/undo previous changes. 2012-07-05 Glenn Morris @@ -2123,7 +2122,7 @@ (Resizing Windows, Deleting Windows, Selecting Windows) (Choosing Window Options, Horizontal Scrolling) (Cyclic Window Ordering, Window History, Dedicated Windows) - (Quitting Windows, Window Configurations, Textual Scrolling): + (Quitting Windows, Window Configurations, Textual Scrolling) (Coordinates and Windows, Window Configurations) (Window Parameters, Window Hooks): Copyedits. (Splitting Windows, Deleting Windows): @@ -2201,7 +2200,7 @@ * processes.texi (Output from Processes, Filter Functions): Mention waiting-for-user-input-p. - (Sentinels, Query Before Exit, System Processes, Transaction Queues): + (Sentinels, Query Before Exit, System Processes, Transaction Queues) (Network Servers, Datagrams, Network Processes, Network Options) (Network Feature Testing, Serial Ports): Copyedits. (Network): Add encrypted network overview paragraph. @@ -2223,7 +2222,7 @@ 2012-04-15 Glenn Morris - * processes.texi (Processes, Subprocess Creation, Shell Arguments): + * processes.texi (Processes, Subprocess Creation, Shell Arguments) (Synchronous Processes, Asynchronous Processes, Deleting Processes): Copyedits. (Subprocess Creation): Discourage modifying exec-path directly. @@ -2243,8 +2242,7 @@ 2012-04-14 Chong Yidong - * customize.texi (Applying Customizations): - (Custom Themes): New nodes. + * customize.texi (Applying Customizations, Custom Themes): New nodes. * display.texi (Defining Faces): Reference custom-set-faces. @@ -2373,8 +2371,8 @@ 2012-03-28 Glenn Morris - * searching.texi (Regular Expressions, Regexp Special): - (Regexp Backslash, Regexp Example, Regexp Functions, Regexp Search): + * searching.texi (Regular Expressions, Regexp Special) + (Regexp Backslash, Regexp Example, Regexp Functions, Regexp Search) (Simple Match Data, Saving Match Data, Standard Regexps): Copyedits. (Regexp Special): Mention collation. Clarify char classes with an example. @@ -2605,7 +2603,7 @@ (Pure Storage): Small changes. (Memory Usage): Copyedit. (Writing Emacs Primitives): Update Fcoordinates_in_window_p and For - example definitions. Give examples of things with non-nil + example definitions. Give examples of things with non-nil interactive args. Mention eval_sub. Remove old info about strings and GCPRO. Mention cus-start.el. (Buffer Internals, Window Internals, Process Internals): @@ -2781,7 +2779,7 @@ (Syntax Class Table): Use a table. (Syntax Properties): Document syntax-propertize-function and syntax-propertize-extend-region-functions. - (Motion via Parsing): Clarify scan-lists. Fix indentation. + (Motion via Parsing): Clarify scan-lists. Fix indentation. (Parser State): Update for the new "c" comment style. Fix description of item 7 (comment style). @@ -3820,7 +3818,7 @@ Document wide integers better. * files.texi (File Attributes): Document ino_t values better. ino_t values no longer map to anything larger than a single cons. - * numbers.texi (Integer Basics, Integer Basics, Arithmetic Operations): + * numbers.texi (Integer Basics, Integer Basics, Arithmetic Operations) (Bitwise Operations): * objects.texi (Integer Type): Use a binary notation that is a bit easier to read, and that will port better if 62-bits becomes the default. @@ -7268,8 +7266,7 @@ * positions.texi (List Motion): * hash.texi (Hash Tables, Creating Hash, Defining Hash): * numbers.texi (Arithmetic Operations, Math Functions) - (Predicates on Numbers, Comparison of Numbers): - (Numeric Conversions): + (Predicates on Numbers, Comparison of Numbers, Numeric Conversions): * locals.texi (Standard Buffer-Local Variables): * maps.texi (Standard Keymaps): * os.texi (User Identification, System Environment, Recording Input) === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-03-02 09:32:46 +0000 +++ doc/misc/ChangeLog 2014-03-03 04:57:26 +0000 @@ -198,7 +198,7 @@ * org.texi (Global and local cycling): Fix missing '@'. -2013-01-07 Bastien Guerry +2013-01-07 Bastien Guerry * org.texi (Global and local cycling): Mention C-u C-u TAB. (Include files, The Export Dispatcher) @@ -993,9 +993,9 @@ 2013-08-10 Xue Fuqiao - * ido.texi (Working Directories): - (Flexible Matching, Regexp Matching, Find File At Point) - (Ignoring, Misc Customization): Use @defopt for user options. + * ido.texi (Working Directories, Flexible Matching, Regexp Matching) + (Find File At Point, Ignoring, Misc Customization): Use @defopt + for user options. 2013-08-09 Xue Fuqiao @@ -1019,8 +1019,7 @@ 2013-08-07 Xue Fuqiao * sc.texi (Introduction): Fix index. - (Usage Overview): - (Citations, Citation Elements, Recognizing Citations) + (Usage Overview, Citations, Citation Elements, Recognizing Citations) (Information Keys and the Info Alist, Reference Headers) (The Built-in Header Rewrite Functions) (Electric References, Reply Buffer Initialization) @@ -1036,8 +1035,7 @@ * newsticker.texi (Usage): Use @key for RET. - * cl.texi (Argument Lists): - (For Clauses): + * cl.texi (Argument Lists, For Clauses) (Macros): Add indexes. 2013-08-05 Xue Fuqiao @@ -1047,7 +1045,7 @@ 2013-08-04 Stephen Berman * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add todo-mode. - (todo-mode, $(buildinfodir)/todo-mode$(INFO_EXT)): + (todo-mode, $(buildinfodir)/todo-mode$(INFO_EXT)) (todo-mode.dvi, todo-mode.pdf): New rules. * todo-mode.texi: New file. @@ -1395,8 +1393,8 @@ 2013-02-09 Jay Belanger - * calc.texi (Basic Operations on Units): - (Customizing Calc): Mention the variable `calc-allow-units-as-numbers'. + * calc.texi (Basic Operations on Units, Customizing Calc): + Mention the variable `calc-allow-units-as-numbers'. 2013-02-08 Aidan Gauland @@ -4105,8 +4103,8 @@ 2010-11-11 Carsten Dominik - * org.texi (Handling links): - (In-buffer settings): Document inlining images on startup. + * org.texi (Handling links, In-buffer settings): + Document inlining images on startup. 2010-11-11 Carsten Dominik @@ -6260,8 +6258,8 @@ 2008-07-23 Vincent Belaïche - * calc.texi (Editing Stack Entries): - (Algebraic Entry): Rewrite introductory sentences so it can be used by + * calc.texi (Editing Stack Entries, Algebraic Entry): + Rewrite introductory sentences so it can be used by Calc's help functions. Mention fixing typos. (Customizing Calc): Fix typo. @@ -9835,11 +9833,9 @@ * info.texi (Help-Xref): * message.texi (Message Headers): * org.texi (Remember): - * reftex.texi (Options (Defining Label Environments)): - (Options (Index Support)): - (Options (Viewing Cross-References)): - (Options (Misc)): - (Changes): + * reftex.texi (Options (Defining Label Environments)) + (Options (Index Support), Options (Viewing Cross-References)) + (Options (Misc), Changes): * speedbar.texi (Creating a display): * tramp.texi (Customizing Completion, Auto-save and Backup): Texinfo usage fix. @@ -10289,7 +10285,7 @@ 2004-11-03 Jan Djärv * idlwave.texi (Continued Statement Indentation): - * reftex.texi (Options (Index Support)): + * reftex.texi (Options (Index Support)) (Displaying and Editing the Index, Table of Contents): * speedbar.texi (Creating a display, Major Display Modes): Replace non-nil with non-@code{nil}. === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-02-25 08:41:47 +0000 +++ etc/ChangeLog 2014-03-03 04:57:26 +0000 @@ -596,7 +596,7 @@ Rename to \versionemacs, same as all the other refcards. * refcards/Makefile (ENVADD): New variable. (sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf) - (%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi): + (%.pdf, %.dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi): Depend on emacsver.tex. Add "." to TEXINPUTS for TeX commands. 2012-09-16 Paul Eggert === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2014-02-25 19:06:53 +0000 +++ lib-src/ChangeLog 2014-03-03 04:57:26 +0000 @@ -1,5 +1,5 @@ 2014-02-25 Andreas Amann (tiny change) - + Fix emacsclient's handling of SIGCONT (Bug#16883). * emacsclient.c (handle_sigcont): Cancel the continue only if tty. @@ -466,7 +466,7 @@ * make-docfile.c (IF_LINT): * emacsclient.c (IF_LINT): Remove (in config.h now). - * make-docfile.c (main): + * make-docfile.c (main) (fopen) [!WINDOWSNT]: (chdir) [!DOS_NT]: No more need to undef. @@ -690,8 +690,8 @@ 2012-06-05 Glenn Morris - * makefile.w32-in ($(BLD)/getdate.$(O), $(BLD)/leditcfns.$(O)): - ($(BLD)/make-path.$(O), $(BLD)/qsort.$(O)): + * makefile.w32-in ($(BLD)/getdate.$(O), $(BLD)/leditcfns.$(O)) + ($(BLD)/make-path.$(O), $(BLD)/qsort.$(O)) ($(BLD)/timer.$(O)): Remove cruft. 2012-06-03 Glenn Morris @@ -1130,7 +1130,7 @@ * emacsclient.c (main): Avoid dangling 'if'. (xstrdup): Remove; no longer needed. - (get_current_dir_name, w32_getenv, get_server_config, find_tty): + (get_current_dir_name, w32_getenv, get_server_config, find_tty) (set_local_socket, main): Use const char *, not char *, for pointers that are not assigned through. @@ -1616,8 +1616,7 @@ * fakemail.c (action): Convert function definitions to standard C. (add_a_stream): - * test-distrib.c (cool_read): - (main): Likewise. + * test-distrib.c (cool_read, main): Likewise. 2010-07-03 Andreas Schwab @@ -2496,7 +2495,7 @@ 2007-08-29 Jason Rumney * emacsclient.c (SEND_STRING, SEND_QUOTED): Remove obfuscation macros. - (quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp): + (quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp) (main): Expand removed macros inline. (main) [WINDOWSNT]: Don't call ttyname. Don't recognize -suspend option. @@ -4132,12 +4131,9 @@ 2001-11-30 Andrew Innes - * makefile.w32-in (FACE_SUPPORT): - (MOUSE_SUPPORT): - (FLOAT_SUPPORT): - (WINNT_SUPPORT): - (lisp): Reference .el files instead of .elc files, to simplify - bootstrapping. + * makefile.w32-in (FACE_SUPPORT, MOUSE_SUPPORT, FLOAT_SUPPORT) + (WINNT_SUPPORT, lisp): Reference .el files instead of .elc files, + to simplify bootstrapping. ($(DOC)): Change dependency to just `make-docfile'. 2001-11-29 Pavel Janík === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-03 03:40:48 +0000 +++ lisp/ChangeLog 2014-03-03 04:57:26 +0000 @@ -34,7 +34,7 @@ (display-mm-dimensions-alist, display-mm-height) (display-mm-width): Doc tweaks. -2014-03-02 Barry O'Reilly +2014-03-02 Barry O'Reilly * simple.el (undo-elt-in-region): Fix buffer corruption for edge case of undo in region. @@ -47,12 +47,12 @@ 2014-03-02 Juanma Barranquero * icomplete.el (icomplete-completions): Use string-width. - Suggested by Stefan Monier . + Suggested by Stefan Monnier . 2014-03-01 Dmitry Gutov - * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight - regexp options. (Bug#16914) + * progmodes/ruby-mode.el (ruby-font-lock-keywords): + Highlight regexp options. (Bug#16914) 2014-03-01 Martin Rudalics @@ -165,8 +165,8 @@ `tramp-adb-command-exit-status'. Change all callees. (tramp-adb-handle-file-attributes) (tramp-adb-handle-directory-files-and-attributes): Use it. - (tramp-adb-ls-output-name-less-p): Use - `directory-listing-before-filename-regexp'. + (tramp-adb-ls-output-name-less-p): + Use `directory-listing-before-filename-regexp'. (tramp-adb-handle-delete-directory): Flush also file properties of the truename of directory. (tramp-adb-handle-file-name-all-completions): Add "./" and "../". @@ -299,9 +299,9 @@ 2014-02-22 Daniel Colascione - * net/secrets.el (secrets-create-item,secrets-search-items): Check - that attribute values are strings, avoiding the construction of - invalid dbus messages. + * net/secrets.el (secrets-create-item,secrets-search-items): + Check that attribute values are strings, avoiding the construction + of invalid dbus messages. 2014-02-21 Juanma Barranquero @@ -543,7 +543,7 @@ (sql-oracle-options): New default value ("-L"). (sql-mode-oracle-font-lock-keywords): Add placeholder highlighting. (sql-placeholders-filter): Correct placeholder pattern. - (sql-read-table-name): Bug fix. Detect absence of SQLi process. + (sql-read-table-name): Bug fix. Detect absence of SQLi process. (sql-login-delay): New variable. (sql-product-interactive): Use it. @@ -878,7 +878,7 @@ 2014-02-04 Fabián Ezequiel Gallina - * progmodes/python.el (python-shell-send-string): + * progmodes/python.el (python-shell-send-string) (python-shell-send-string-no-output): Fix docstring (Bug#16547). 2014-02-04 Anders Lindgren @@ -948,11 +948,13 @@ 2014-02-02 Daniel Colascione - * progmodes/cc-defs.el (c-find-assignment-for-mode): Make loading cc-mode silent. + * progmodes/cc-defs.el (c-find-assignment-for-mode): + Make loading cc-mode silent. 2014-02-02 Daniel Colascione - * comint.el (comint-prompt-read-only): Change doc to suggest remap keybinding. + * comint.el (comint-prompt-read-only): Change doc to suggest + remap keybinding. 2014-02-02 Glenn Morris @@ -1220,7 +1222,7 @@ * international/quail.el (quail-define-package): Doc fix. - * emacs-lisp/authors.el (authors-valid-file-names): + * emacs-lisp/authors.el (authors-valid-file-names) (authors-renamed-files-alist): Additions. * vc/vc-git.el (vc-git-print-log): Remove --follow; @@ -1356,7 +1358,7 @@ * emacs-lisp/authors.el (authors-aliases): Remove unnecessary entries. Make M-x authors return zero *Authors Errors* from current logs. - * emacs-lisp/authors.el (authors-obsolete-files-regexps): + * emacs-lisp/authors.el (authors-obsolete-files-regexps) (authors-ignored-files): Add some entries, remove others. (authors-ambiguous-files, authors-valid-file-names): Add some entries. @@ -1503,7 +1505,7 @@ Spelling fixes. * emacs-lisp/generic.el (generic--normalize-comments): Rename from generic--normalise-comments. All uses changed. - * play/bubbles.el (bubbles--neighborhood-score): + * play/bubbles.el (bubbles--neighborhood-score) (bubbles--mark-direct-neighbors, bubbles--mark-neighborhood) (bubbles--neighborhood-available) (bubbles--update-neighborhood-score): @@ -2014,8 +2016,7 @@ 2013-12-25 Fabián Ezequiel Gallina - * progmodes/python.el: - (python-nav--lisp-forward-sexp): New function. + * progmodes/python.el (python-nav--lisp-forward-sexp): New function. (python-nav--lisp-forward-sexp-safe): Use it. Rename from python-nav-lisp-forward-sexp-safe. (python-nav--forward-sexp): New argument SAFE allows switching @@ -4463,9 +4464,9 @@ (find-buffer-file-type-coding-system): Mark obsolete. (w32-find-file-not-found-set-buffer-file-coding-system): Rename from find-file-not-found-set-buffer-file-coding-system. - (w32-untranslated-filesystem-list, w32-untranslated-canonical-name): + (w32-untranslated-filesystem-list, w32-untranslated-canonical-name) (w32-add-untranslated-filesystem, w32-remove-untranslated-filesystem) - (w32-direct-print-region-use-command-dot-com, w32-untranslated-file-p): + (w32-direct-print-region-use-command-dot-com, w32-untranslated-file-p) (w32-direct-print-region-helper, w32-direct-print-region-function) (w32-direct-ps-print-region-function): Rename by adding a "w32-" prefix. * startup.el (normal-top-level-add-subdirs-to-load-path): @@ -4548,8 +4549,7 @@ 2013-10-27 Xue Fuqiao - * image.el (defimage): - (image-load-path): Doc fixes. + * image.el (defimage, image-load-path): Doc fixes. 2013-10-27 Alan Mackenzie @@ -4925,7 +4925,7 @@ (verilog-in-struct-nested-p, verilog-at-struct-mv-p) (verilog-at-close-struct-p): New functions. (verilog-beg-block-re-ordered, verilog-extended-case-re) - (verilog-forward-sexp, verilog-set-auto-endcomments): + (verilog-forward-sexp, verilog-set-auto-endcomments) (verilog-leap-to-case-head): Handle "unique0" case. (verilog-in-constraint-re): New constant. (verilog-keywords, verilog-type-font-keywords): @@ -5751,8 +5751,7 @@ 2013-09-28 Stefan Monnier - * emacs-lisp/cl-macs.el: - (cl--loop-destr-temps): Remove. + * emacs-lisp/cl-macs.el (cl--loop-destr-temps): Remove. (cl--loop-iterator-function): Rename from cl--loop-map-form and change its convention. (cl--loop-set-iterator-function): New function. @@ -7927,25 +7926,24 @@ 2013-08-04 Xue Fuqiao * vc/vc.el (vc-ignore): Rewrite. - (vc-default-ignore-completion-table): - (vc--read-lines): + (vc-default-ignore-completion-table, vc--read-lines) (vc--add-line, vc--remove-regexp): New functions. * vc/vc-svn.el (vc-svn-ignore): Doc fix. (vc-svn-ignore-completion-table): New function. * vc/vc-hg.el (vc-hg-ignore): Rewrite. - (vc-hg-ignore-completion-table): + (vc-hg-ignore-completion-table) (vc-hg-find-ignore-file): New functions. * vc/vc-git.el (vc-git-ignore): Rewrite. - (vc-git-ignore-completion-table): + (vc-git-ignore-completion-table) (vc-git-find-ignore-file): New functions. * vc/vc-dir.el (vc-dir-menu-map): Add menu for vc-dir-ignore. * vc/vc-bzr.el (vc-bzr-ignore): Rewrite. - (vc-bzr-ignore-completion-table): + (vc-bzr-ignore-completion-table) (vc-bzr-find-ignore-file): New functions. 2013-08-03 Juanma Barranquero @@ -8347,7 +8345,7 @@ * net/tramp-sh.el (tramp-sh-handle-file-notify-supported-p): Remove functions. - * autorevert.el (auto-revert-use-notify): + * autorevert.el (auto-revert-use-notify) (auto-revert-notify-add-watch): * net/tramp.el (tramp-file-name-for-operation): * net/tramp-adb.el (tramp-adb-file-name-handler-alist): @@ -8394,10 +8392,9 @@ 2013-07-24 Xue Fuqiao - * ido.el (ido-fractionp): - (ido-cache-ftp-work-directory-time, ido-max-prospects, ido-mode) - (ido-max-file-prompt-width, ido-unc-hosts-cache) - (ido-max-directory-size, ido-max-dir-file-cache) + * ido.el (ido-fractionp, ido-cache-ftp-work-directory-time) + (ido-max-prospects, ido-mode, ido-max-file-prompt-width) + (ido-unc-hosts-cache, ido-max-directory-size, ido-max-dir-file-cache) (ido-decorations): Doc fix. * ansi-color.el: Fix old URL. @@ -8687,7 +8684,7 @@ 2013-07-12 Dmitry Gutov - * progmodes/ruby-mode.el (ruby-percent-literals-beg-re): + * progmodes/ruby-mode.el (ruby-percent-literals-beg-re) (ruby-syntax-expansion-allowed-p): Support array of symbols, for Ruby 2.0. (ruby-font-lock-keywords): Distinguish calls to functions with @@ -8931,7 +8928,7 @@ 2013-07-06 Michael Albinus - * net/tramp-sh.el (tramp-sh-file-gvfs-monitor-dir-process-filter): + * net/tramp-sh.el (tramp-sh-file-gvfs-monitor-dir-process-filter) (tramp-sh-file-inotifywait-process-filter): Handle file names with spaces. @@ -9732,7 +9729,7 @@ (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) - (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): + (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check) (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) @@ -12745,7 +12742,7 @@ * net/tramp-sh.el (tramp-perl-pack, tramp-perl-unpack): New defconst. (tramp-local-coding-commands, tramp-remote-coding-commands): Use them. - (tramp-sh-handle-file-local-copy, tramp-sh-handle-write-region): + (tramp-sh-handle-file-local-copy, tramp-sh-handle-write-region) (tramp-find-inline-compress): Improve traces. (tramp-maybe-send-script): Check for Perl binary. (tramp-get-inline-coding): Do not redirect STDOUT for local decoding. === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2014-02-13 02:19:48 +0000 +++ lisp/cedet/ChangeLog 2014-03-03 04:57:26 +0000 @@ -1238,7 +1238,7 @@ * semantic/wisent/python.el (wisent-python-string-start-re) (wisent-python-string-re, wisent-python-forward-string) - (wisent-python-forward-line,wisent-python-lex-string): + (wisent-python-forward-line, wisent-python-lex-string): New variables. (wisent-python-forward-balanced-expression): New function. @@ -1341,7 +1341,7 @@ (ede-directory-safe-p): Check it. (ede-initialize-state-current-buffer, ede, ede-new) (ede-check-project-directory, ede-rescan-toplevel) - (ede-load-project-file, ede-parent-project, ede-current-project): + (ede-load-project-file, ede-parent-project, ede-current-project) (ede-target-parent): Avoid loading in a project unless it is safe, since it may involve malicious code. This security flaw was pointed out by Hiroshi Oota. @@ -1454,7 +1454,7 @@ (semantic-decoration-unknown-include-describe): Fix filenames in docstring. - * semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent): + * semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent) (semantic-ede-grammar-compiler-bovine): Fix requires that are added to the grammar-make-script. @@ -1471,7 +1471,7 @@ 2011-10-19 Chong Yidong - * ede.el (ede-minor-mode,global-ede-mode): + * ede.el (ede-minor-mode, global-ede-mode): * semantic.el (semantic-mode): Doc fix to reflect new define-minor-mode calling behavior. @@ -1695,10 +1695,10 @@ Synch EDE to CEDET 1.0. * cedet-idutils.el (cedet-idutils-make-command): New option. - (cedet-idutils-mkid-call): + (cedet-idutils-mkid-call) (cedet-idutils-create/update-database): New functions. - * cedet-cscope.el (cedet-cscope-create): + * cedet-cscope.el (cedet-cscope-create) (cedet-cscope-create/update-database): New functions. (cedet-cscope-support-for-directory): Make interactive. @@ -1750,7 +1750,7 @@ (ede-project-root, ede-project-root-directory): Move to ede/auto.el. - * ede/locate.el (ede-locate-flush-hash): + * ede/locate.el (ede-locate-flush-hash) (ede-locate-create/update-root-database): New methods. (initialize-instance): Use ede-locate-flush-hash. @@ -1863,7 +1863,7 @@ (semantic-decoration-on-includes-highlight-default): Check that the include tag has a position. - * semantic/complete.el (semantic-collector-local-members): + * semantic/complete.el (semantic-collector-local-members) (semantic-complete-read-tag-local-members) (semantic-complete-jump-local-members): New class and functions. (semantic-complete-self-insert): Save excursion before completing. @@ -2035,7 +2035,7 @@ Use define-minor-mode in CEDET where applicable. - * srecode/mode.el (srecode-minor-mode,global-srecode-minor-mode): + * srecode/mode.el (srecode-minor-mode, global-srecode-minor-mode): Use define-minor-mode. * semantic/util-modes.el (semantic-add-minor-mode): @@ -2522,7 +2522,7 @@ (semantic-analyzer-debug-global-symbol) (semantic-analyzer-debug-missing-innertype) (semantic-analyzer-debug-insert-include-summary): - * semantic/util.el (semantic-file-tag-table): + * semantic/util.el (semantic-file-tag-table) (semantic-describe-buffer-var-helper, semantic-something-to-tag-table) (semantic-recursive-find-nonterminal-by-name): * semantic/tag-ls.el (semantic-tag-calculate-parent-default): @@ -2530,15 +2530,15 @@ * semantic/symref.el (semantic-symref-parse-tool-output): * semantic/sb.el (semantic-sb-fetch-tag-table): * semantic/lex-spp.el (semantic-lex-spp-lex-text-string): - * semantic/idle.el (semantic-idle-work-for-one-buffer): + * semantic/idle.el (semantic-idle-work-for-one-buffer) (semantic-idle-summary-maybe-highlight): * semantic/ia-sb.el (semantic-ia-speedbar) (semantic-ia-sb-tag-info): * semantic/grammar.el (semantic-analyze-possible-completions): * semantic/find.el (semantic-brute-find-tag-by-position): - * semantic/ede-grammar.el (project-compile-target): + * semantic/ede-grammar.el (project-compile-target) (ede-proj-makefile-insert-variables): - * semantic/debug.el (semantic-debug-set-parser-location): + * semantic/debug.el (semantic-debug-set-parser-location) (semantic-debug-set-source-location, semantic-debug-interface-layout) (semantic-debug-mode, semantic-debug): * semantic/db.el (semanticdb-needs-refresh-p): @@ -2569,10 +2569,10 @@ * ede.el (ede-buffer-header-file, ede-find-target) (ede-buffer-documentation-files, ede-project-buffers, ede-set) (ede-target-buffers, ede-buffers, ede-make-project-local-variable): - * cedet-idutils.el (cedet-idutils-fnid-call): + * cedet-idutils.el (cedet-idutils-fnid-call) (cedet-idutils-lid-call, cedet-idutils-expand-filename) (cedet-idutils-version-check): - * cedet-global.el (cedet-gnu-global-call): + * cedet-global.el (cedet-gnu-global-call) (cedet-gnu-global-expand-filename, cedet-gnu-global-root) (cedet-gnu-global-version-check, cedet-gnu-global-scan-hits): * cedet-cscope.el (cedet-cscope-call) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-02-22 01:44:59 +0000 +++ lisp/gnus/ChangeLog 2014-03-03 04:57:26 +0000 @@ -11344,7 +11344,7 @@ 2010-03-30 Chong Yidong - * message.el (message-default-mail-headers): + * message.el (message-default-mail-headers) (message-default-headers): Carry the value mail-default-headers over into message-default-mail-headers, rather than message-default-headers. @@ -25364,10 +25364,10 @@ 2002-08-07 Simon Josefsson * sieve-manage.el (require): Use SASL, not RFC2104/MD5. - (sieve-manage-authenticators): + (sieve-manage-authenticators) (sieve-manage-authenticator-alist): Add some SASL mechs. (sieve-sasl-auth): New function. - (sieve-manage-cram-md5-auth): + (sieve-manage-cram-md5-auth) (sieve-manage-plain-auth): Rewrite using SASL library. (sieve-manage-digest-md5-p, sieve-manage-digest-md5-auth) (sieve-manage-scram-md5-p, sieve-manage-scram-md5-auth) === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2014-01-26 00:47:40 +0000 +++ lisp/mh-e/ChangeLog 2014-03-03 04:57:26 +0000 @@ -274,7 +274,7 @@ 2011-07-09 Bill Wohler - * mh-speed.el (mh-speed-toggle,mh-speed-view): Document "ignored" + * mh-speed.el (mh-speed-toggle, mh-speed-view): Document "ignored" arguments to keep checkdoc happy. * mh-search.el (mh-flists-execute): Ditto. @@ -408,8 +408,8 @@ 2009-11-05 Stefan Monnier * mh-thread.el (mh-thread-set-tables): - * mh-speed.el (mh-folder-speedbar-menu-items, mh-speed-stealth-update): - (mh-speed-extract-folder-name, mh-speed-parse-flists-output): + * mh-speed.el (mh-folder-speedbar-menu-items, mh-speed-stealth-update) + (mh-speed-extract-folder-name, mh-speed-parse-flists-output) (mh-speed-invalidate-map, mh-speed-add-folder): * mh-show.el (mh-invalidate-show-buffer, mh-show-sequence-menu): * mh-seq.el (mh-list-sequences): @@ -427,7 +427,7 @@ * mh-e.el (mh-exec-cmd, mh-exec-cmd-error, mh-exec-cmd-daemon) (mh-handle-process-error, mh-variant-info): * mh-comp.el (mh-forward): - * mh-alias.el (mh-alias-local-users, mh-alias-which-file-has-alias): + * mh-alias.el (mh-alias-local-users, mh-alias-which-file-has-alias) (mh-alias-add-alias-to-file): Use with-current-buffer (closes SF #1903293). @@ -718,7 +718,7 @@ * mh-acros.el (mh-do-in-gnu-emacs, mh-do-in-xemacs) (with-mh-folder-updating, mh-in-show-buffer) - (mh-iterate-on-messages-in-region, mh-iterate-on-range): + (mh-iterate-on-messages-in-region, mh-iterate-on-range) (mh-do-at-event-location): Add debug decls. (mh-seq-msgs): Use defsubst. === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2014-01-21 08:49:46 +0000 +++ lwlib/ChangeLog 2014-03-03 04:57:26 +0000 @@ -297,8 +297,7 @@ (lw_create_widget, lw_pop_all_widgets, lw_show_busy) (lw_refigure_widget, lw_allow_resizing): Remove alternative K&R declarations. - * lwlib-Xlw.c (xlw_update_one_widget): - (xlw_pop_instance): Likewise. + * lwlib-Xlw.c (xlw_update_one_widget, xlw_pop_instance): Likewise. * lwlib-Xaw.c (xaw_update_one_widget, xaw_pop_instance): Likewise. * lwlib-Xm.c (P_): Remove. @@ -474,7 +473,7 @@ XtCDefaultFace): New. * xlwmenuP.h (_window_state): Add max_rest_width and xft_draw. - (_XlwMenu_part): Add faceName,xft_fg, xft_bg, xft_disabled_fg and + (_XlwMenu_part): Add faceName, xft_fg, xft_bg, xft_disabled_fg and xft_font. 2010-03-10 Chong Yidong @@ -596,8 +595,7 @@ * xlwmenuP.h (_XlwMenu_part): Add fontSet resource. - * xlwmenu.c (string_width): - (MENU_FONT_HEIGHT, MENU_FONT_ASCENT): Ditto. + * xlwmenu.c (string_width, MENU_FONT_HEIGHT, MENU_FONT_ASCENT): Ditto. (display_menu_item, make_drawing_gcs, XlwMenuInitialize) (XlwMenuSetValues): Use font if fontSet is NULL, use only font for !HAVE_X_I18N. === modified file 'nt/ChangeLog' --- nt/ChangeLog 2014-02-17 19:04:51 +0000 +++ nt/ChangeLog 2014-03-03 04:57:26 +0000 @@ -561,7 +561,7 @@ * nmake.defs: Use !if, not !ifdef. For the details, see http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html - * inc/stdint.h (INTPTR_MIN): + * inc/stdint.h (INTPTR_MIN) (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC. 2012-11-18 Eli Zaretskii @@ -2480,7 +2480,7 @@ 2001-12-03 Andrew Innes - * makefile.w32-in (bootstrap-nmake): + * makefile.w32-in (bootstrap-nmake) (bootstrap-gmake): Extend bootstrap process to first do bootstrap-clean in lisp dir and rebuild the DOC file. (bootstrap): Do a "normal" make after the bootstrap work. @@ -2671,7 +2671,7 @@ 2001-01-24 Andrew Innes - * makefile.w32-in (cleanall-other-dirs-nmake): + * makefile.w32-in (cleanall-other-dirs-nmake) (cleanall-other-dirs-gmake): New targets. (cleanall): Invoke them. === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-01 19:15:29 +0000 +++ src/ChangeLog 2014-03-03 04:57:26 +0000 @@ -156,7 +156,7 @@ * emacs.c (main): Initialize daemon_pipe[1] here ... (syms_of_emacs): ... instead of here. -2014-02-16 Anders Lindgern +2014-02-16 Anders Lindgern * nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask is set (Bug#16505). @@ -924,7 +924,7 @@ 2013-12-25 Chong Yidong - * keyboard.c (Voverriding_terminal_local_map): + * keyboard.c (Voverriding_terminal_local_map) (Voverriding_local_map): Doc fix. * keymap.c (Vemulation_mode_map_alists): Doc fix. @@ -1246,10 +1246,10 @@ (decode_coding_c_string): * composite.h (COMPOSITION_DECODE_REFS, COMPOSITION_DECODE_RULE): * conf_post.h (has_attribute): - * dispextern.h (trace_redisplay_p): + * dispextern.h (trace_redisplay_p) (INC_TEXT_POS, DEC_TEXT_POS, SET_GLYPH_FROM_GLYPH_CODE) (SET_CHAR_GLYPH, SET_CHAR_GLYPH_FROM_GLYPH) - (SET_GLYPH_FROM_CHAR_GLYPH): + (SET_GLYPH_FROM_CHAR_GLYPH) (WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P) (FACE_SUITABLE_FOR_ASCII_CHAR_P, FACE_SUITABLE_FOR_CHAR_P) (PRODUCE_GLYPHS, reset_mouse_highlight, in_display_vector_p) @@ -1268,7 +1268,7 @@ (FONT_SET_STYLE, CHECK_FONT, CHECK_FONT_SPEC, CHECK_FONT_ENTITY) (CHECK_FONT_OBJECT, CHECK_FONT_GET_OBJECT, FONT_ADD_LOG) (FONT_DEFERRED_LOG): - * frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_WINDOW_P): + * frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_WINDOW_P) (FRAME_EXTERNAL_TOOL_BAR, FRAME_EXTERNAL_MENU_BAR, FOR_EACH_FRAME) (FRAME_MOUSE_UPDATE): * fringe.c (Fdefine_fringe_bitmap): @@ -1337,8 +1337,9 @@ * conf_post.h: Include . (bool_bf): New type. * dispextern.h (TRACE, PREPARE_FACE_FOR_DISPLAY): - * intervals.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE) - Surround statement macro with proper 'do { ... } while (false)' brackets. + * intervals.h (RESET_INTERVAL, COPY_INTERVAL_CACHE) + (MERGE_INTERVAL_CACHE): Surround statement macro with proper + 'do { ... } while (false)' brackets. * dispextern.h (IF_DEBUG): Properly parenthesize and convert to void. Args must now be expressions; all callers changed. (SET_MATRIX_ROW_ENABLED_P): Assume 2nd arg is bool. @@ -3719,7 +3720,7 @@ 2013-10-08 Jan Djärv - * nsterm.m (windowDidExitFullScreen:): + * nsterm.m (windowDidExitFullScreen:) (toggleFullScreen:): Change NS_IMPL_COCOA to HAVE_NATIVE_FS. 2013-10-08 Paul Eggert @@ -4078,8 +4079,7 @@ * process.c (wait_reading_process_output): Change int pnamelen to socklen_t. - * nsterm.m (setMarkedText:selectedRange:): - (deleteWorkingText): + * nsterm.m (setMarkedText:selectedRange:, deleteWorkingText): * nsmenu.m (addDisplayItemWithImage:idx:tag:helpText:enabled:): * nsfont.m (ns_get_covering_families, ns_findfonts): Cast NSLog argument to unsigned long to avoid warning. @@ -5015,8 +5015,8 @@ 2013-08-29 Dmitry Antipov * xterm.c (x_clear_area): Lost 7th arg because it is always False. - (x_after_update_window_line, x_scroll_bar_create): - (x_scroll_bar_set_handle, XTset_vertical_scroll_bar): + (x_after_update_window_line, x_scroll_bar_create) + (x_scroll_bar_set_handle, XTset_vertical_scroll_bar) (handle_one_xevent, x_clear_frame_area): * gtkutil.c (xg_clear_under_internal_border, xg_update_scrollbar_pos): * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): Adjust users. @@ -5986,7 +5986,7 @@ (menubar_selection_callback, menu_position_func) (popup_selection_callback, create_and_show_popup_menu) (dialog_selection_callback, create_and_show_dialog): - * xrdb.c (x_get_string_resource): + * xrdb.c (x_get_string_resource) (main) [TESTRM]: * xsmfns.c (x_session_check_input): * xterm.c (x_draw_glyphless_glyph_string_foreground) @@ -6313,7 +6313,7 @@ Fix last font-related change. * w32font.h (w32font_list_internal, w32font_match_internal): Fix prototype. - * w32uniscribe.c (uniscribe_list, uniscribe_match): + * w32uniscribe.c (uniscribe_list, uniscribe_match) (uniscribe_list_family): Adjust to match font API change. MS-Windows breakage reported by Juanma Barranquero at http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00006.html. @@ -6331,7 +6331,7 @@ functions to accept struct frame * as first arg. * font.c (font_score, font_compare, font_sort_entities): Remove prototypes. - (font_sort_entities, font_list_entities, font_select_entity): + (font_sort_entities, font_list_entities, font_select_entity) (font_find_for_lface, Flist_fonts, Ffont_family_list): Adjust to match font API change. * xfont.c (xfont_list, xfont_match, xfont_list_family): @@ -6339,7 +6339,7 @@ * ftxfont.c (ftxfont_list, ftxfont_match): * xftfont.c (xftfont_list, xftfont_match): * nsfont.m (nsfont_list, nsfont_match, nsfont_list_family): - * w32font.c (w32font_list, w32font_match, w32font_list): + * w32font.c (w32font_list, w32font_match, w32font_list) (w32font_list_internal, w32_font_match_internal): Likewise. * xfaces.c (Fx_family_fonts): Adjust user. @@ -6364,7 +6364,7 @@ have more than one X frame on the same X display. (any_help_event_p, x_draw_glyph_string_background, x_display_ok): Use bool for booleans. - (x_draw_glyph_string_background, cvt_string_to_pixel): + (x_draw_glyph_string_background, cvt_string_to_pixel) (cvt_pixel_dtor): Drop unnecessary prototypes. * xterm.h (x_display_ok): Adjust prototype. @@ -7310,7 +7310,7 @@ (close_on_exec, accept4, process_socket) [!SOCK_CLOEXEC]: New functions. (socket) [!SOCK_CLOEXEC]: Supply a substitute. - (Fmake_network_process, Fnetwork_interface_list): + (Fmake_network_process, Fnetwork_interface_list) (Fnetwork_interface_info, server_accept_connection): Make newly-created socket close-on-exec. * sysdep.c (emacs_open, emacs_fopen): @@ -9443,7 +9443,7 @@ * image.c (gif_load): Assume pass < 3 to pacify GCC. * process.c (Fset_process_datagram_address) (Fmake_network_process): Check get_lisp_to_sockaddr_size return value. - * xdisp.c (get_char_face_and_encoding): + * xdisp.c (get_char_face_and_encoding) (get_glyph_face_and_encoding): Ensure that *CHAR2B is initialized. (get_glyph_face_and_encoding): Prepare face before possibly using it. (get_per_char_metric): Don't use CHAR2B if it might not be initialized. === modified file 'test/ChangeLog' --- test/ChangeLog 2014-03-02 17:37:32 +0000 +++ test/ChangeLog 2014-03-03 04:57:26 +0000 @@ -1,4 +1,4 @@ -2014-03-02 Barry O'Reilly +2014-03-02 Barry O'Reilly * automated/undo-tests.el (undo-test-in-region-not-most-recent): Add new test of undo in region. @@ -325,7 +325,7 @@ (tramp-test20-file-modes, tramp-test21-file-links) (tramp-test22-file-times, tramp-test23-visited-file-modtime) (tramp-test24-file-name-completion, tramp-test25-load) - (tramp-test26-process-file, tramp-test27-start-file-process): + (tramp-test26-process-file, tramp-test27-start-file-process) (tramp-test28-shell-command): Protect unwindforms with `ignore-errors'. (tramp-test29-utf8): New test. @@ -344,7 +344,7 @@ * automated/tramp-tests.el (tramp-test-temporary-file-directory): Check $TRAMP_TEST_TEMPORARY_FILE_DIRECTORY. (tramp-read-passwd): Check $TRAMP_TEST_ALLOW_PASSWORD. - (tramp-test09-insert-file-contents, tramp-test10-write-region): + (tramp-test09-insert-file-contents, tramp-test10-write-region) (tramp-test26-process-file): Add tests. (tramp-test11-copy-file): Remove debug message. (tramp-test20-file-modes): Special case, if user is "root". @@ -1618,22 +1618,22 @@ Add icalendar-testsuite--test-datestring-to-isodate, icalendar-testsuite--test-datetime-to-diary-date, and icalendar-testsuite--test-calendar-style. - (icalendar-testsuite--test-format-ical-event): + (icalendar-testsuite--test-format-ical-event) (icalendar-testsuite--test-parse-summary-and-rest): Doc fix. Remove european-calendar-style. (icalendar-testsuite--get-ical-event): Doc fix. - (icalendar-testsuite--test-first-weekday-of-year): + (icalendar-testsuite--test-first-weekday-of-year) (icalendar-testsuite--run-cycle-tests): Add doc string. - (icalendar-testsuite--test-datestring-to-isodate): - (icalendar-testsuite--test-datetime-to-diary-date): + (icalendar-testsuite--test-datestring-to-isodate) + (icalendar-testsuite--test-datetime-to-diary-date) (icalendar-testsuite--test-calendar-style): New functions. (icalendar-testsuite--test-export): Handle iso date style. New arg INPUT-ISO. Use calendar-date-style. (icalendar-testsuite--test-import): Handle iso date style. New arg EXPECTED-ISO. Use calendar-date-style. (icalendar-testsuite--test-cycle): Handle iso date style. - (icalendar-testsuite--run-import-tests): - (icalendar-testsuite--run-export-tests): + (icalendar-testsuite--run-import-tests) + (icalendar-testsuite--run-export-tests) (icalendar-testsuite--run-real-world-tests): Add iso style tests. 2008-02-29 Glenn Morris ------------------------------------------------------------ revno: 116638 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-03-03 04:40:48 +0100 message: lisp/icomplete.el (icomplete-completions): Follow-up to revno:116616. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-03 02:27:08 +0000 +++ lisp/ChangeLog 2014-03-03 03:40:48 +0000 @@ -1,5 +1,9 @@ 2014-03-03 Juanma Barranquero + * icomplete.el (icomplete-completions): Follow-up to revno:116616. + +2014-03-03 Juanma Barranquero + * icomplete.el: Miscellaneous doc fixes. Use Icomplete everywhere instead of icomplete for consistency. (icomplete-max-delay-chars): Fix typo. === modified file 'lisp/icomplete.el' --- lisp/icomplete.el 2014-03-03 02:27:08 +0000 +++ lisp/icomplete.el 2014-03-03 03:40:48 +0000 @@ -483,7 +483,7 @@ (concat determ "{" (mapconcat 'identity prospects icomplete-separator) - (and limit (concat icomplete-separator "…")) + (and limit (concat icomplete-separator ellipsis)) "}") (concat determ " [Matched]")))))) ------------------------------------------------------------ revno: 116637 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-03-03 03:27:08 +0100 message: lisp/icomplete.el, lisp/ido.el: Doc fixes. lisp/icomplete.el: Miscellaneous doc fixes. Use Icomplete everywhere instead of icomplete for consistency. (icomplete-max-delay-chars): Fix typo. (icomplete-mode): Use \[]. (icomplete-tidy, icomplete-exhibit): Reflow. (icomplete-minibuffer-setup-hook, icomplete-completions): Remove superfluous backlashes. lisp/ido.el: Miscellaneous doc fixes. Use Ido everywhere instead of ido or `ido' for consistency. (ido-record-ftp-work-directories, ido-merge-ftp-work-directories) (ido-cache-ftp-work-directory-time, ido-slow-ftp-hosts) (ido-slow-ftp-host-regexps, ido-reread-directory): Upcase "ftp". (ido-separator): Extract obsolescence info from docstring and declare with make-obsolete-variable. (ido-minibuffer-setup-hook): Simplify example. (ido-text, ido-text-init, ido-input-stack, ido-report-no-match) (ido-wide-find-file, ido-wide-find-dir, ido-wide-find-dir-or-delete-dir) (ido-completion-help, ido-completing-read): Fix typos in docstrings. (ido-everywhere): Reflow docstring. (ido-toggle-vc): Doc fix. (ido-switch-buffer, ido-find-file): Use tabs to improve legibility of long list of keybindings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-03 01:00:27 +0000 +++ lisp/ChangeLog 2014-03-03 02:27:08 +0000 @@ -1,3 +1,29 @@ +2014-03-03 Juanma Barranquero + + * icomplete.el: Miscellaneous doc fixes. + Use Icomplete everywhere instead of icomplete for consistency. + (icomplete-max-delay-chars): Fix typo. + (icomplete-mode): Use \[]. + (icomplete-tidy, icomplete-exhibit): Reflow. + (icomplete-minibuffer-setup-hook, icomplete-completions): + Remove superfluous backlashes. + + * ido.el: Miscellaneous doc fixes. + Use Ido everywhere instead of ido or `ido' for consistency. + (ido-record-ftp-work-directories, ido-merge-ftp-work-directories) + (ido-cache-ftp-work-directory-time, ido-slow-ftp-hosts) + (ido-slow-ftp-host-regexps, ido-reread-directory): Upcase "ftp". + (ido-separator): Extract obsolescence info from docstring and declare + with make-obsolete-variable. + (ido-minibuffer-setup-hook): Simplify example. + (ido-text, ido-text-init, ido-input-stack, ido-report-no-match) + (ido-wide-find-file, ido-wide-find-dir, ido-wide-find-dir-or-delete-dir) + (ido-completion-help, ido-completing-read): Fix typos in docstrings. + (ido-everywhere): Reflow docstring. + (ido-toggle-vc): Doc fix. + (ido-switch-buffer, ido-find-file): Use tabs to improve legibility + of long list of keybindings. + 2014-03-03 Glenn Morris * frame.el (display-pixel-height, display-pixel-width) === modified file 'lisp/icomplete.el' --- lisp/icomplete.el 2014-03-02 00:50:07 +0000 +++ lisp/icomplete.el 2014-03-03 02:27:08 +0000 @@ -61,7 +61,7 @@ 'icomplete-prospects-length 'icomplete-prospects-height "23.1") (defcustom icomplete-separator " | " - "String used by icomplete to separate alternatives in the minibuffer." + "String used by Icomplete to separate alternatives in the minibuffer." :type 'string :version "24.4") @@ -77,7 +77,7 @@ :version "24.4") (defcustom icomplete-with-completion-tables t - "Specialized completion tables with which icomplete should operate. + "Specialized completion tables with which Icomplete should operate. If this is t, Icomplete operates on all tables. Otherwise this should be a list of the completion tables (e.g., `internal-complete-buffer') on which Icomplete should operate." @@ -87,7 +87,7 @@ (repeat function))) (defface icomplete-first-match '((t :weight bold)) - "Face used by icomplete for highlighting first match." + "Face used by Icomplete for highlighting first match." :version "24.4") ;;;_* User Customization variables @@ -109,7 +109,7 @@ :type 'integer) (defcustom icomplete-max-delay-chars 3 - "Maximum number of initial chars to apply icomplete compute delay." + "Maximum number of initial chars to apply `icomplete-compute-delay'." :type 'integer) (defvar icomplete-in-buffer nil @@ -118,12 +118,12 @@ (defcustom icomplete-minibuffer-setup-hook nil "Icomplete-specific customization of minibuffer setup. -This hook is run during minibuffer setup if icomplete is active. -It is intended for use in customizing icomplete for interoperation +This hook is run during minibuffer setup if Icomplete is active. +It is intended for use in customizing Icomplete for interoperation with other features and packages. For instance: - \(add-hook 'icomplete-minibuffer-setup-hook - \(lambda () (setq-local max-mini-window-height 3))) + (add-hook 'icomplete-minibuffer-setup-hook + (lambda () (setq-local max-mini-window-height 3))) will constrain Emacs to a maximum minibuffer height of 3 lines when icompletion is occurring." @@ -197,7 +197,7 @@ description of how prospective completions are displayed. For more information, see Info node `(emacs)Icomplete'. -For options you can set, `M-x customize-group icomplete'. +For options you can set, `\\[customize-group] icomplete'. You can use the following key bindings to navigate and select completions: @@ -295,16 +295,16 @@ ;;;_ > icomplete-tidy () (defun icomplete-tidy () - "Remove completions display \(if any) prior to new user input. -Should be run in on the minibuffer `pre-command-hook'. See `icomplete-mode' -and `minibuffer-setup-hook'." + "Remove completions display (if any) prior to new user input. +Should be run in on the minibuffer `pre-command-hook'. +See `icomplete-mode' and `minibuffer-setup-hook'." (delete-overlay icomplete-overlay)) ;;;_ > icomplete-exhibit () (defun icomplete-exhibit () - "Insert icomplete completions display. -Should be run via minibuffer `post-command-hook'. See `icomplete-mode' -and `minibuffer-setup-hook'." + "Insert Icomplete completions display. +Should be run via minibuffer `post-command-hook'. +See `icomplete-mode' and `minibuffer-setup-hook'." (when (and icomplete-mode (icomplete-simple-completing-p)) ;Shouldn't be necessary. (save-excursion @@ -352,17 +352,17 @@ minibuffer completion. Prospective completion suffixes (if any) are displayed, bracketed by -one of \(), \[], or \{} pairs. The choice of brackets is as follows: +one of (), [], or {} pairs. The choice of brackets is as follows: - \(...) - a single prospect is identified and matching is enforced, - \[...] - a single prospect is identified but matching is optional, or - \{...} - multiple prospects, separated by commas, are indicated, and + (...) - a single prospect is identified and matching is enforced, + [...] - a single prospect is identified but matching is optional, or + {...} - multiple prospects, separated by commas, are indicated, and further input is required to distinguish a single one. If there are multiple possibilities, `icomplete-separator' separates them. The displays for unambiguous matches have ` [Matched]' appended -\(whether complete or not), or ` \[No matches]', if no eligible +\(whether complete or not), or ` [No matches]', if no eligible matches exist." (let* ((minibuffer-completion-table candidates) (minibuffer-completion-predicate predicate) === modified file 'lisp/ido.el' --- lisp/ido.el 2014-02-17 15:29:15 +0000 +++ lisp/ido.el 2014-03-03 02:27:08 +0000 @@ -162,7 +162,7 @@ ;; ;; The standard way of completion with Unix-shells and Emacs is to insert a ;; PREFIX and then hitting TAB (or another completion key). Cause of this -;; behavior has become second nature to a lot of Emacs users `ido' offers in +;; behavior has become second nature to a lot of Emacs users, Ido offers in ;; addition to the default substring-matching-method (look above) also the ;; prefix-matching-method. The kind of matching is the only difference to ;; the description of the substring-matching above. @@ -206,7 +206,7 @@ ;; Customization ;; ------------- ;; -;; Customize the `ido' group to change the `ido' functionality. +;; Customize the Ido group to change the Ido functionality. ;; ;; To modify the keybindings, use the ido-setup-hook. For example: ;;(add-hook 'ido-setup-hook 'ido-my-keys) @@ -277,7 +277,7 @@ ;; If you don't want to rely on the `ido-everywhere' functionality, ;; ido-read-buffer, ido-read-file-name, and ido-read-directory-name ;; can be used by other packages to read a buffer name, a file name, -;; or a directory name in the `ido' way. +;; or a directory name in the Ido way. ;;; Acknowledgments @@ -345,11 +345,11 @@ (defcustom ido-mode nil "Determines for which buffer/file Ido should be enabled. The following values are possible: -- `buffer': Turn only on ido buffer behavior (switching, killing, +- `buffer': Turn only on Ido buffer behavior (switching, killing, displaying...) -- `file': Turn only on ido file behavior (finding, writing, inserting...) -- `both': Turn on ido buffer and file behavior. -- nil: Turn off any ido switching. +- `file': Turn only on Ido file behavior (finding, writing, inserting...) +- `both': Turn on Ido buffer and file behavior. +- nil: Turn off any Ido switching. Setting this variable directly does not take effect; use either \\[customize] or the function `ido-mode'." @@ -467,7 +467,7 @@ :group 'ido) (defcustom ido-enable-flex-matching nil - "Non-nil means that `ido' will do flexible string matching. + "Non-nil means that Ido will do flexible string matching. Flexible matching means that if the entered string does not match any item, any item containing the entered characters in the given sequence will match." @@ -476,8 +476,8 @@ (defcustom ido-enable-regexp nil - "Non-nil means that `ido' will do regexp matching. -Value can be toggled within `ido' using `ido-toggle-regexp'." + "Non-nil means that Ido will do regexp matching. +Value can be toggled within Ido using `ido-toggle-regexp'." :type 'boolean :group 'ido) @@ -485,7 +485,7 @@ "Non-nil means only match if the entered text is a prefix of file name. This behavior is like the standard Emacs completion. If nil, match if the entered text is an arbitrary substring. -Value can be toggled within `ido' using `ido-toggle-prefix'." +Value can be toggled within Ido using `ido-toggle-prefix'." :type 'boolean :group 'ido) @@ -499,7 +499,7 @@ ;; See http://debbugs.gnu.org/2042 for more info. (defcustom ido-buffer-disable-smart-matches t "Non-nil means not to re-order matches for buffer switching. -By default, ido arranges matches in the following order: +By default, Ido arranges matches in the following order: full-matches > suffix matches > prefix matches > remaining matches @@ -564,7 +564,7 @@ :group 'ido) (defcustom ido-enable-last-directory-history t - "Non-nil means that `ido' will remember latest selected directory names. + "Non-nil means that Ido will remember latest selected directory names. See `ido-last-directory-list' and `ido-save-directory-list-file'." :type 'boolean :group 'ido) @@ -585,7 +585,7 @@ (defcustom ido-use-filename-at-point nil - "Non-nil means that ido shall look for a filename at point. + "Non-nil means that Ido shall look for a filename at point. May use `ffap-guesser' to guess whether text at point is a filename. If found, use that as the starting point for filename selection." :type '(choice @@ -603,38 +603,38 @@ (defcustom ido-enable-tramp-completion t - "Non-nil means that ido shall perform tramp method and server name completion. + "Non-nil means that Ido shall perform tramp method and server name completion. A tramp file name uses the following syntax: /method:user@host:filename." :type 'boolean :group 'ido) (defcustom ido-record-ftp-work-directories t - "Non-nil means record ftp file names in the work directory list." + "Non-nil means record FTP file names in the work directory list." :type 'boolean :group 'ido) (defcustom ido-merge-ftp-work-directories nil - "If nil, merging ignores ftp file names in the work directory list." + "If nil, merging ignores FTP file names in the work directory list." :type 'boolean :group 'ido) (defcustom ido-cache-ftp-work-directory-time 1.0 - "Maximum time to cache contents of an ftp directory (in hours). + "Maximum time to cache contents of an FTP directory (in hours). \\ Use \\[ido-reread-directory] in prompt to refresh list. -If zero, ftp directories are not cached." +If zero, FTP directories are not cached." :type 'number :group 'ido) (defcustom ido-slow-ftp-hosts nil - "List of slow ftp hosts where ido prompting should not be used. -If an ftp host is on this list, ido automatically switches to the non-ido + "List of slow FTP hosts where Ido prompting should not be used. +If an FTP host is on this list, Ido automatically switches to the non-Ido equivalent function, e.g. `find-file' rather than `ido-find-file'." :type '(repeat string) :group 'ido) (defcustom ido-slow-ftp-host-regexps nil - "List of regexps matching slow ftp hosts (see `ido-slow-ftp-hosts')." + "List of regexps matching slow FTP hosts (see `ido-slow-ftp-hosts')." :type '(repeat regexp) :group 'ido) @@ -726,16 +726,16 @@ :group 'ido) (defcustom ido-max-directory-size nil - "Maximum size (in bytes) for directories to use ido completion. + "Maximum size (in bytes) for directories to use Ido completion. \\ -If you enter a directory with a size larger than this size, ido will +If you enter a directory with a size larger than this size, Ido will not provide the normal completion. To show the completions, use \\[ido-toggle-ignore]." :type '(choice (const :tag "No limit" nil) (integer :tag "Size in bytes" 30000)) :group 'ido) (defcustom ido-rotate-file-list-default nil - "Non-nil means that `ido' will always rotate file list to get default in front." + "Non-nil means that Ido will always rotate file list to get default in front." :type 'boolean :group 'ido) @@ -762,21 +762,23 @@ :group 'ido) (defcustom ido-setup-hook nil - "Hook run after the ido variables and keymap have been setup. + "Hook run after the Ido variables and keymap have been setup. The dynamic variable `ido-cur-item' contains the current type of item that -is read by ido; possible values are file, dir, buffer, and list. +is read by Ido; possible values are file, dir, buffer, and list. Additional keys can be defined in `ido-completion-map'." :type 'hook :group 'ido) (defcustom ido-separator nil - "String used by ido to separate the alternatives in the minibuffer. -Obsolete. Set 3rd element of `ido-decorations' instead." + "String used by Ido to separate the alternatives in the minibuffer." :type '(choice string (const nil)) :group 'ido) +(make-obsolete-variable 'ido-separator + "set 3rd element of `ido-decorations' instead." nil) -(defcustom ido-decorations '( "{" "}" " | " " | ..." "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]" " [Confirm]") - "List of strings used by ido to display the alternatives in the minibuffer. +(defcustom ido-decorations '("{" "}" " | " " | ..." "[" "]" " [No match]" + " [Matched]" " [Not readable]" " [Too big]" " [Confirm]") + "List of strings used by Ido to display the alternatives in the minibuffer. There are between 11 and 13 elements in this list: 1st and 2nd elements are used as brackets around the prospect list, 3rd element is the separator between prospects (ignored if @@ -820,19 +822,19 @@ :group 'ido) (defcustom ido-use-faces t - "Non-nil means use ido faces to highlighting first match, only match and + "Non-nil means use Ido faces to highlighting first match, only match and subdirs in the alternatives." :type 'boolean :group 'ido) (defface ido-first-match '((t :weight bold)) - "Face used by ido for highlighting first match." + "Face used by Ido for highlighting first match." :group 'ido) (defface ido-only-match '((((class color)) :foreground "ForestGreen") (t :slant italic)) - "Face used by ido for highlighting only match." + "Face used by Ido for highlighting only match." :group 'ido) (defface ido-subdir '((((min-colors 88) (class color)) @@ -840,11 +842,11 @@ (((class color)) :foreground "red") (t :underline t)) - "Face used by ido for highlighting subdirs in the alternatives." + "Face used by Ido for highlighting subdirs in the alternatives." :group 'ido) (defface ido-virtual '((t :inherit font-lock-builtin-face)) - "Face used by ido for matching virtual buffer names." + "Face used by Ido for matching virtual buffer names." :version "24.1" :group 'ido) @@ -853,7 +855,7 @@ (((class color)) :foreground "yellow" :background "red" :width condensed) (t :inverse-video t)) - "Face used by ido for highlighting its indicators." + "Face used by Ido for highlighting its indicators." :group 'ido) (defface ido-incomplete-regexp @@ -901,7 +903,7 @@ :group 'ido) (defvar ido-rewrite-file-prompt-rules nil - "Alist of rewriting rules for directory names in ido prompts. + "Alist of rewriting rules for directory names in Ido prompts. A list of elements of the form (FROM . TO) or (FROM . FUNC), each meaning to rewrite the directory name if matched by FROM by either substituting the matched string by TO or calling the function FUNC @@ -911,7 +913,7 @@ `ido-rewrite-file-prompt-functions'.") (defcustom ido-completion-buffer "*Ido Completions*" - "Name of completion buffer used by ido. + "Name of completion buffer used by Ido. Set to nil to disable completion buffers popping up." :type 'string :group 'ido) @@ -934,40 +936,37 @@ (defcustom ido-minibuffer-setup-hook nil "Ido-specific customization of minibuffer setup. -This hook is run during minibuffer setup if `ido' is active. -It is intended for use in customizing ido for interoperation +This hook is run during minibuffer setup if Ido is active. +It is intended for use in customizing Ido for interoperation with other packages. For instance: - \(add-hook 'ido-minibuffer-setup-hook - \(function - \(lambda () - \(make-local-variable 'max-mini-window-height) - \(setq max-mini-window-height 3)))) + (add-hook 'ido-minibuffer-setup-hook + (lambda () (setq-local max-mini-window-height 3))) will constrain Emacs to a maximum minibuffer height of 3 lines when -ido is running. Copied from `icomplete-minibuffer-setup-hook'." +Ido is running. Copied from `icomplete-minibuffer-setup-hook'." :type 'hook :group 'ido) (defcustom ido-save-directory-list-file (locate-user-emacs-file "ido.last" ".ido.last") - "File in which the ido state is saved between invocations. + "File in which the Ido state is saved between invocations. Variables stored are: `ido-last-directory-list', `ido-work-directory-list', `ido-work-file-list', and `ido-dir-file-cache'. -Must be set before enabling ido mode." +Must be set before enabling Ido mode." :version "24.4" ; added locate-user-emacs-file :type 'string :group 'ido) (defcustom ido-read-file-name-as-directory-commands '() - "List of commands which uses `read-file-name' to read a directory name. + "List of commands which use `read-file-name' to read a directory name. When `ido-everywhere' is non-nil, the commands in this list will read the directory using `ido-read-directory-name'." :type '(repeat symbol) :group 'ido) (defcustom ido-read-file-name-non-ido '() - "List of commands which shall not read file names the ido way. + "List of commands which shall not read file names the Ido way. When `ido-everywhere' is non-nil, the commands in this list will read the file name using normal `read-file-name' style." :type '(repeat symbol) @@ -984,19 +983,19 @@ ;; Persistent variables (defvar ido-completion-map nil - "Currently active keymap for ido commands.") + "Currently active keymap for Ido commands.") (defvar ido-common-completion-map nil - "Keymap for all ido commands.") + "Keymap for all Ido commands.") (defvar ido-file-completion-map nil - "Keymap for ido file commands.") + "Keymap for Ido file commands.") (defvar ido-file-dir-completion-map nil - "Keymap for ido file and directory commands.") + "Keymap for Ido file and directory commands.") (defvar ido-buffer-completion-map nil - "Keymap for ido buffer commands.") + "Keymap for Ido buffer commands.") (defvar ido-file-history nil "History of files selected using `ido-find-file'.") @@ -1024,8 +1023,8 @@ Each element in the list is of the form (DIR (MTIME) FILE...).") (defvar ido-ignore-item-temp-list nil - "List of items to ignore in current ido invocation. -Intended to be let-bound by functions which call ido repeatedly. + "List of items to ignore in current Ido invocation. +Intended to be let-bound by functions which call Ido repeatedly. Should never be set permanently.") ;; Temporary storage @@ -1045,19 +1044,19 @@ "Non-nil means we are rotating list of matches.") (defvar ido-text nil - "Stores the users string as it is typed in.") + "Stores the user's string as it is typed in.") (defvar ido-text-init nil - "The initial string for the users string it is typed in.") + "The initial string for the user's string it is typed in.") (defvar ido-input-stack nil - "Stores the users strings when user hits M-b/M-f.") + "Stores the user's strings when user hits M-b/M-f.") (defvar ido-matches nil "List of files currently matching `ido-text'.") (defvar ido-report-no-match t - "Report [No Match] when no completions matches `ido-text'.") + "Report \"[No Match]\" when no completions matches `ido-text'.") (defvar ido-exit nil "Flag to monitor how `ido-find-file' exits. @@ -1071,8 +1070,8 @@ "Delay timer for auto merge.") (defvar ido-use-mycompletion-depth 0 - "Non-nil means use `ido' completion feedback. -Is set by ido functions to the current `minibuffer-depth', + "Non-nil means use Ido completion feedback. +Is set by Ido functions to the current `minibuffer-depth', so that it doesn't interfere with other minibuffer usage.") (defvar ido-incomplete-regexp nil @@ -1283,7 +1282,8 @@ (defun ido-is-ftp-directory (&optional dir) (string-match (if ido-enable-tramp-completion - "\\`/[^/:][^/:]+:" ;; like tramp-file-name-regexp-unified, but doesn't match single drive letters + ;; like tramp-file-name-regexp-unified, but doesn't match single drive letters + "\\`/[^/:][^/:]+:" "\\`/[^/:][^/:]+:/") (or dir ido-current-directory))) @@ -1353,7 +1353,7 @@ (insert "\n)\n"))) (defun ido-save-history () - "Save ido history and cache information between sessions." + "Save Ido history and cache information between sessions." (interactive) (when (and ido-last-directory-list ido-save-directory-list-file) (let ((buf (get-buffer-create " *ido session*")) @@ -1374,7 +1374,7 @@ (kill-buffer buf))))) (defun ido-load-history (&optional arg) - "Load ido history and cache information from previous session. + "Load Ido history and cache information from previous session. With prefix argument, reload history unconditionally." (interactive "P") (if (or arg (and ido-save-directory-list-file (not ido-last-directory-list))) @@ -1397,7 +1397,7 @@ (ido-wash-history)) (defun ido-wash-history () - "Clean-up ido history and cache information. + "Clean-up Ido history and cache information. Removes badly formatted data and ignored directories." (interactive) ;; Check format of each of our lists, discard bogus elements @@ -1510,8 +1510,8 @@ (define-minor-mode ido-everywhere "Toggle use of Ido for all buffer/file reading. With a prefix argument ARG, enable this feature if ARG is -positive, and disable it otherwise. If called from Lisp, enable -the mode if ARG is omitted or nil." +positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil." :global t :group 'ido (when (get 'ido-everywhere 'file) @@ -1532,11 +1532,11 @@ ;;;###autoload (defun ido-mode (&optional arg) - "Toggle ido mode on or off. -With ARG, turn ido-mode on if arg is positive, off otherwise. -Turning on ido-mode will remap (via a minor-mode keymap) the default + "Toggle Ido mode on or off. +With ARG, turn Ido mode on if arg is positive, off otherwise. +Turning on Ido mode will remap (via a minor-mode keymap) the default keybindings for the `find-file' and `switch-to-buffer' families of -commands to the ido versions of these functions. +commands to the Ido versions of these functions. However, if ARG arg equals 'files, remap only commands for files, or if it equals 'buffers, remap only commands for buffer switching. This function also adds a hook to the minibuffer." @@ -1598,7 +1598,7 @@ ;;; IDO KEYMAP (defun ido-init-completion-maps () - "Set up the completion keymaps used by `ido'." + "Set up the completion keymaps used by Ido." ;; Common map (let ((map (make-sparse-keymap))) @@ -1679,7 +1679,7 @@ (defun ido-setup-completion-map () - "Set up the keymap for `ido'." + "Set up the keymap for Ido." ;; generated every time so that it can inherit new functions. (let ((map (make-sparse-keymap)) @@ -2205,7 +2205,7 @@ ido-selected)) (defun ido-edit-input () - "Edit absolute file name entered so far with ido; terminate by RET. + "Edit absolute file name entered so far with Ido; terminate by RET. If cursor is not at the end of the user input, move to end of input." (interactive) (if (not (eobp)) @@ -2616,7 +2616,7 @@ (ido-complete))) (defun ido-undo-merge-work-directory (&optional text try refresh) - "Undo or redo last ido directory merge operation. + "Undo or redo last Ido directory merge operation. If no merge has yet taken place, toggle automatic merging option." (interactive) (cond @@ -2648,9 +2648,9 @@ "Move forward in user input or perform magic action. If no user input is present, or at end of input, perform magic actions: C-x C-b ... C-f switch to `ido-find-file'. -C-x C-f ... C-f fallback to non-ido `find-file'. -C-x C-d ... C-f fallback to non-ido brief `dired'. -C-x d ... C-f fallback to non-ido `dired'." +C-x C-f ... C-f fallback to non-Ido `find-file'. +C-x C-d ... C-f fallback to non-Ido brief `dired'. +C-x d ... C-f fallback to non-Ido `dired'." (interactive "P") (cond ((or arg (not (eobp))) @@ -2671,7 +2671,7 @@ C-x C-f C-b switch to `ido-switch-buffer'. C-x C-d C-b switch to `ido-switch-buffer'. C-x d C-b switch to `ido-switch-buffer'. -C-x C-b C-b fallback to non-ido `switch-to-buffer'." +C-x C-b C-b fallback to non-Ido `switch-to-buffer'." (interactive "P") (cond ((or arg (> (point) (minibuffer-prompt-end))) @@ -2744,7 +2744,7 @@ (exit-minibuffer))) (defun ido-toggle-vc () - "Disable version control for this file." + "Toggle version control for this file." (interactive) (if (and ido-mode (eq ido-cur-item 'file)) (progn @@ -2781,7 +2781,7 @@ (defun ido-reread-directory () "Read current directory again. May be useful if cached version is no longer valid, but directory -timestamp has not changed (e.g. with ftp or on Windows)." +timestamp has not changed (e.g. with FTP or on Windows)." (interactive) (if (and ido-mode (memq ido-cur-item '(file dir))) (progn @@ -2815,7 +2815,7 @@ (exit-minibuffer)) (defun ido-fallback-command () - "Fallback to non-ido version of current command." + "Fallback to non-Ido version of current command." (interactive) (let ((i (length ido-text))) (while (> i 0) @@ -2949,7 +2949,7 @@ (exit-minibuffer)) (defun ido-wide-find-file (&optional file) - "Prompt for FILE to search for using find, starting from current directory." + "Prompt for FILE to search for using `find', starting from current directory." (interactive) (unless file (let ((enable-recursive-minibuffers t)) @@ -2965,7 +2965,7 @@ (exit-minibuffer))) (defun ido-wide-find-dir (&optional dir) - "Prompt for DIR to search for using find, starting from current directory." + "Prompt for DIR to search for using `find', starting from current directory." (interactive) (unless dir (let ((enable-recursive-minibuffers t)) @@ -2981,7 +2981,7 @@ (exit-minibuffer))) (defun ido-wide-find-dir-or-delete-dir (&optional _dir) - "Prompt for DIR to search for using find, starting from current directory. + "Prompt for DIR to search for using `find', starting from current directory. If input stack is non-empty, delete current directory component." (interactive) (if ido-input-stack @@ -3938,7 +3938,7 @@ t)) (defun ido-completion-help () - "Show possible completions in a *File Completions* buffer." + "Show possible completions in a \"*File Completions*\" buffer." (interactive) (setq ido-rescan nil) (let ((temp-buf (and ido-completion-buffer @@ -4119,31 +4119,31 @@ in another frame. As you type in a string, all of the buffers matching the string are -displayed if substring-matching is used \(default). Look at +displayed if substring-matching is used (default). Look at `ido-enable-prefix' and `ido-toggle-prefix'. When you have found the buffer you want, it can then be selected. As you type, most keys have their normal keybindings, except for the following: \\ -RET Select the buffer at the front of the list of matches. If the -list is empty, possibly prompt to create new buffer. - -\\[ido-select-text] Use the current input string verbatim. - -\\[ido-next-match] Put the first element at the end of the list. -\\[ido-prev-match] Put the last element at the start of the list. -\\[ido-complete] Complete a common suffix to the current string that -matches all buffers. If there is only one match, select that buffer. -If there is no common suffix, show a list of all matching buffers -in a separate window. -\\[ido-edit-input] Edit input string. -\\[ido-fallback-command] Fallback to non-ido version of current command. -\\[ido-toggle-regexp] Toggle regexp searching. -\\[ido-toggle-prefix] Toggle between substring and prefix matching. -\\[ido-toggle-case] Toggle case-sensitive searching of buffer names. -\\[ido-completion-help] Show list of matching buffers in separate window. -\\[ido-enter-find-file] Drop into `ido-find-file'. -\\[ido-kill-buffer-at-head] Kill buffer at head of buffer list. -\\[ido-toggle-ignore] Toggle ignoring buffers listed in `ido-ignore-buffers'." +RET\tSelect the buffer at the front of the list of matches. +\tIf the list is empty, possibly prompt to create new buffer. + +\\[ido-select-text]\tUse the current input string verbatim. + +\\[ido-next-match]\tPut the first element at the end of the list. +\\[ido-prev-match]\tPut the last element at the start of the list. +\\[ido-complete]\tComplete a common suffix to the current string that matches +\tall buffers. If there is only one match, select that buffer. +\tIf there is no common suffix, show a list of all matching buffers +\tin a separate window. +\\[ido-edit-input]\tEdit input string. +\\[ido-fallback-command]\tFallback to non-ido version of current command. +\\[ido-toggle-regexp]\tToggle regexp searching. +\\[ido-toggle-prefix]\tToggle between substring and prefix matching. +\\[ido-toggle-case]\tToggle case-sensitive searching of buffer names. +\\[ido-completion-help]\tShow list of matching buffers in separate window. +\\[ido-enter-find-file]\tDrop into `ido-find-file'. +\\[ido-kill-buffer-at-head]\tKill buffer at head of buffer list. +\\[ido-toggle-ignore]\tToggle ignoring buffers listed in `ido-ignore-buffers'." (interactive) (ido-buffer-internal ido-default-buffer-method)) @@ -4169,7 +4169,8 @@ The buffer name is selected interactively by typing a substring. For details of keybindings, see `ido-switch-buffer'." (interactive) - (ido-buffer-internal 'kill 'kill-buffer "Kill buffer: " (buffer-name (current-buffer)) nil 'ignore)) + (ido-buffer-internal 'kill 'kill-buffer "Kill buffer: " + (buffer-name (current-buffer)) nil 'ignore)) ;;;###autoload (defun ido-insert-buffer () @@ -4177,7 +4178,8 @@ The buffer name is selected interactively by typing a substring. For details of keybindings, see `ido-switch-buffer'." (interactive) - (ido-buffer-internal 'insert 'insert-buffer "Insert buffer: " nil nil 'ido-enter-insert-file)) + (ido-buffer-internal 'insert 'insert-buffer "Insert buffer: " + nil nil 'ido-enter-insert-file)) ;;;###autoload (defun ido-switch-buffer-other-frame () @@ -4200,42 +4202,45 @@ (defun ido-find-file () "Edit file with name obtained via minibuffer. The file is displayed according to `ido-default-file-method' -- the -default is to show it in the same window, unless it is already -visible in another frame. +default is to show it in the same window, unless it is already visible +in another frame. The file name is selected interactively by typing a substring. As you type in a string, all of the filenames matching the string are displayed -if substring-matching is used \(default). Look at `ido-enable-prefix' and +if substring-matching is used (default). Look at `ido-enable-prefix' and `ido-toggle-prefix'. When you have found the filename you want, it can then be selected. As you type, most keys have their normal keybindings, except for the following: \\ -RET Select the file at the front of the list of matches. If the -list is empty, possibly prompt to create new file. - -\\[ido-select-text] Use the current input string verbatim. - -\\[ido-next-match] Put the first element at the end of the list. -\\[ido-prev-match] Put the last element at the start of the list. -\\[ido-complete] Complete a common suffix to the current string that -matches all files. If there is only one match, select that file. -If there is no common suffix, show a list of all matching files -in a separate window. -\\[ido-magic-delete-char] Open the specified directory in Dired mode. -\\[ido-edit-input] Edit input string (including directory). -\\[ido-prev-work-directory] or \\[ido-next-work-directory] go to previous/next directory in work directory history. -\\[ido-merge-work-directories] search for file in the work directory history. -\\[ido-forget-work-directory] removes current directory from the work directory history. -\\[ido-prev-work-file] or \\[ido-next-work-file] cycle through the work file history. -\\[ido-wide-find-file-or-pop-dir] and \\[ido-wide-find-dir-or-delete-dir] prompts and uses find to locate files or directories. -\\[ido-make-directory] prompts for a directory to create in current directory. -\\[ido-fallback-command] Fallback to non-ido version of current command. -\\[ido-toggle-regexp] Toggle regexp searching. -\\[ido-toggle-prefix] Toggle between substring and prefix matching. -\\[ido-toggle-case] Toggle case-sensitive searching of file names. -\\[ido-toggle-literal] Toggle literal reading of this file. -\\[ido-completion-help] Show list of matching files in separate window. -\\[ido-toggle-ignore] Toggle ignoring files listed in `ido-ignore-files'." +RET\tSelect the file at the front of the list of matches. +\tIf the list is empty, possibly prompt to create new file. + +\\[ido-select-text]\tUse the current input string verbatim. + +\\[ido-next-match]\tPut the first element at the end of the list. +\\[ido-prev-match]\tPut the last element at the start of the list. +\\[ido-complete]\tComplete a common suffix to the current string that matches +\tall files. If there is only one match, select that file. +\tIf there is no common suffix, show a list of all matching files +\tin a separate window. +\\[ido-magic-delete-char]\tOpen the specified directory in Dired mode. +\\[ido-edit-input]\tEdit input string (including directory). +\\[ido-prev-work-directory]\tGo to previous directory in work directory history. +\\[ido-next-work-directory]\tGo to next directory in work directory history. +\\[ido-merge-work-directories]\tSearch for file in the work directory history. +\\[ido-forget-work-directory]\tRemove current directory from the work directory history. +\\[ido-prev-work-file]\tCycle to previous file in work file history. +\\[ido-next-work-file]\tCycle to next file in work file history. +\\[ido-wide-find-file-or-pop-dir]\tPrompt for a file and use find to locate it. +\\[ido-wide-find-dir-or-delete-dir]\tPrompt for a directory and use find to locate it. +\\[ido-make-directory]\tPrompt for a directory to create in current directory. +\\[ido-fallback-command]\tFallback to non-Ido version of current command. +\\[ido-toggle-regexp]\tToggle regexp searching. +\\[ido-toggle-prefix]\tToggle between substring and prefix matching. +\\[ido-toggle-case]\tToggle case-sensitive searching of file names. +\\[ido-toggle-literal]\tToggle literal reading of this file. +\\[ido-completion-help]\tShow list of matching files in separate window. +\\[ido-toggle-ignore]\tToggle ignoring files listed in `ido-ignore-files'." (interactive) (ido-file-internal ido-default-file-method)) @@ -4270,7 +4275,8 @@ The file name is selected interactively by typing a substring. For details of keybindings, see `ido-find-file'." (interactive) - (ido-file-internal 'read-only 'find-file-read-only-other-window nil "Find file read-only other window: ")) + (ido-file-internal 'read-only 'find-file-read-only-other-window nil + "Find file read-only other window: ")) ;;;###autoload (defun ido-find-file-read-only-other-frame () @@ -4278,7 +4284,8 @@ The file name is selected interactively by typing a substring. For details of keybindings, see `ido-find-file'." (interactive) - (ido-file-internal 'read-only 'find-file-read-only-other-frame nil "Find file read-only other frame: ")) + (ido-file-internal 'read-only 'find-file-read-only-other-frame nil + "Find file read-only other frame: ")) ;;;###autoload (defun ido-display-file () @@ -4320,7 +4327,7 @@ ;;;###autoload (defun ido-dired () - "Call `dired' the ido way. + "Call `dired' the Ido way. The directory is selected interactively by typing a substring. For details of keybindings, see `ido-find-file'." (interactive) @@ -4329,7 +4336,7 @@ (ido-file-internal 'dired 'dired nil "Dired: " 'dir))) (defun ido-list-directory () - "Call `list-directory' the ido way. + "Call `list-directory' the Ido way. The directory is selected interactively by typing a substring. For details of keybindings, see `ido-find-file'." (interactive) @@ -4367,7 +4374,7 @@ (throw 'ido contents)))) (defun ido-exhibit () - "Post command hook for `ido'." + "Post command hook for Ido." ;; Find matching files and display a list in the minibuffer. ;; Copied from `icomplete-exhibit' with two changes: ;; 1. It prints a default file name when there is no text yet entered. @@ -4695,7 +4702,7 @@ (nth 1 ido-decorations))))))) (defun ido-minibuffer-setup () - "Minibuffer setup hook for `ido'." + "Minibuffer setup hook for Ido." ;; Copied from `icomplete-minibuffer-setup-hook'. (when (ido-active) (add-hook 'pre-command-hook 'ido-tidy nil t) @@ -4709,7 +4716,7 @@ (setq ido-initial-position nil)))) (defun ido-tidy () - "Pre command hook for `ido'." + "Pre command hook for Ido." ;; Remove completions display, if any, prior to new user input. ;; Copied from `icomplete-tidy'." @@ -4868,10 +4875,10 @@ (defun ido-completing-read (prompt choices &optional _predicate require-match initial-input hist def _inherit-input-method) "Ido replacement for the built-in `completing-read'. -Read a string in the minibuffer with ido-style completion. +Read a string in the minibuffer with Ido-style completion. PROMPT is a string to prompt with; normally it ends in a colon and a space. CHOICES is a list of strings which are the possible completions. -PREDICATE and INHERIT-INPUT-METHOD is currently ignored; it is included +PREDICATE and INHERIT-INPUT-METHOD are currently ignored; they are included to be compatible with `completing-read'. If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless the input is (or completes to) an element of CHOICES or is null. ------------------------------------------------------------ revno: 116636 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-03-02 17:41:28 -0800 message: * etc/NEWS: Tweak previous change. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-03-03 01:16:58 +0000 +++ etc/NEWS 2014-03-03 01:41:28 +0000 @@ -1377,7 +1377,9 @@ --- *** Face specs set via Custom themes now replace the `defface' spec rather than inheriting from it. In other words, setting a face via a -theme now behaves like setting it via Customize. +theme now behaves like setting it via Customize: you only need to +specify the attributes that you want, you don't need to unset those +that you don't want. --- *** New face characteristic (supports :underline (:style wave)) ------------------------------------------------------------ revno: 116635 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-03-02 17:16:58 -0800 message: * etc/NEWS: Minor edit diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-03-03 01:00:27 +0000 +++ etc/NEWS 2014-03-03 01:16:58 +0000 @@ -1374,8 +1374,10 @@ *** New function `add-face-text-property', which can be used to conveniently prepend/append new face properties. +--- *** Face specs set via Custom themes now replace the `defface' spec -rather than inheriting from it (as do face specs set via Customize). +rather than inheriting from it. In other words, setting a face via a +theme now behaves like setting it via Customize. --- *** New face characteristic (supports :underline (:style wave)) ------------------------------------------------------------ revno: 116634 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-03-02 17:00:27 -0800 message: Minor doc tweaks for display-*-width, height * lisp/frame.el (display-pixel-height, display-pixel-width) (display-mm-dimensions-alist, display-mm-height) (display-mm-width): Doc tweaks. * doc/lispref/frames.texi: Remove FIXME comments. The x- versions of these functions are internal details that do not need documenting. * etc/NEWS: Related markup. diff: === modified file 'doc/lispref/frames.texi' --- doc/lispref/frames.texi 2014-02-27 10:15:52 +0000 +++ doc/lispref/frames.texi 2014-03-03 01:00:27 +0000 @@ -2421,7 +2421,6 @@ This function returns the number of screens associated with the display. @end defun -@c FIXME: Document `x-display-pixel-{width, height}'? @defun display-pixel-height &optional display This function returns the height of the screen in pixels. On a character terminal, it gives the height in characters. @@ -2440,7 +2439,6 @@ @var{display}. @xref{Multiple Terminals}. @end defun -@c FIXME: Document `x-display-mm-{width, height}'? @defun display-mm-height &optional display This function returns the height of the screen in millimeters, or @code{nil} if Emacs cannot get that information. === modified file 'etc/NEWS' --- etc/NEWS 2014-03-02 08:54:32 +0000 +++ etc/NEWS 2014-03-03 01:00:27 +0000 @@ -142,10 +142,11 @@ `frame-monitor-attributes' can be used to obtain information about each physical monitor on multi-monitor setups. ++++ *** The functions `display-pixel-width' and `display-pixel-height' now behave consistently among the platforms: they return the pixel width or height for all physical monitors associated with the given display -as if they were on X11. To get information for each physical +as if they were on X. To get information for each physical monitor, use the new functions above. Similar notes also apply to `x-display-pixel-width', `x-display-pixel-height', `display-mm-width', `display-mm-height', `x-display-mm-width', and `x-display-mm-height'. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-02 17:37:32 +0000 +++ lisp/ChangeLog 2014-03-03 01:00:27 +0000 @@ -1,3 +1,9 @@ +2014-03-03 Glenn Morris + + * frame.el (display-pixel-height, display-pixel-width) + (display-mm-dimensions-alist, display-mm-height) + (display-mm-width): Doc tweaks. + 2014-03-02 Barry O'Reilly * simple.el (undo-elt-in-region): Fix buffer corruption for edge === modified file 'lisp/frame.el' --- lisp/frame.el 2014-03-01 01:32:42 +0000 +++ lisp/frame.el 2014-03-03 01:00:27 +0000 @@ -1393,12 +1393,14 @@ (defun display-pixel-height (&optional display) "Return the height of DISPLAY's screen in pixels. +If DISPLAY is omitted or nil, it defaults to the selected frame's display. + For character terminals, each character counts as a single pixel. + For graphical terminals, note that on \"multi-monitor\" setups this refers to the pixel height for all physical monitors associated with DISPLAY. To get information for each physical monitor, use -`display-monitor-attributes-list'. -If DISPLAY is omitted or nil, it defaults to the selected frame's display." +`display-monitor-attributes-list'." (let ((frame-type (framep-on-display display))) (cond ((memq frame-type '(x w32 ns)) @@ -1410,12 +1412,14 @@ (defun display-pixel-width (&optional display) "Return the width of DISPLAY's screen in pixels. +If DISPLAY is omitted or nil, it defaults to the selected frame's display. + For character terminals, each character counts as a single pixel. + For graphical terminals, note that on \"multi-monitor\" setups this refers to the pixel width for all physical monitors associated with DISPLAY. To get information for each physical monitor, use -`display-monitor-attributes-list'. -If DISPLAY is omitted or nil, it defaults to the selected frame's display." +`display-monitor-attributes-list'." (let ((frame-type (framep-on-display display))) (cond ((memq frame-type '(x w32 ns)) @@ -1425,14 +1429,14 @@ (defcustom display-mm-dimensions-alist nil "Alist for specifying screen dimensions in millimeters. -The dimensions will be used for `display-mm-height' and -`display-mm-width' if defined for the respective display. - -Each element of the alist has the form (display . (width . height)), -e.g. (\":0.0\" . (287 . 215)). - -If `display' equals t, it specifies dimensions for all graphical -displays not explicitly specified." +The functions `display-mm-height' and `display-mm-width' consult +this list before asking the system. + +Each element has the form (DISPLAY . (WIDTH . HEIGHT)), e.g. +\(\":0.0\" . (287 . 215)). + +If `display' is t, it specifies dimensions for all graphical displays +not explicitly specified." :version "22.1" :type '(alist :key-type (choice (string :tag "Display name") (const :tag "Default" t)) @@ -1445,13 +1449,16 @@ (defun display-mm-height (&optional display) "Return the height of DISPLAY's screen in millimeters. -System values can be overridden by `display-mm-dimensions-alist'. -If the information is unavailable, value is nil. +If the information is unavailable, this function returns nil. +If DISPLAY is omitted or nil, it defaults to the selected frame's display. + +You can override what the system thinks the result should be by +adding an entry to `display-mm-dimensions-alist'. + For graphical terminals, note that on \"multi-monitor\" setups this refers to the height in millimeters for all physical monitors associated with DISPLAY. To get information for each physical -monitor, use `display-monitor-attributes-list'. -If DISPLAY is omitted or nil, it defaults to the selected frame's display." +monitor, use `display-monitor-attributes-list'." (and (memq (framep-on-display display) '(x w32 ns)) (or (cddr (assoc (or display (frame-parameter nil 'display)) display-mm-dimensions-alist)) @@ -1462,13 +1469,16 @@ (defun display-mm-width (&optional display) "Return the width of DISPLAY's screen in millimeters. -System values can be overridden by `display-mm-dimensions-alist'. -If the information is unavailable, value is nil. +If the information is unavailable, this function returns nil. +If DISPLAY is omitted or nil, it defaults to the selected frame's display. + +You can override what the system thinks the result should be by +adding an entry to `display-mm-dimensions-alist'. + For graphical terminals, note that on \"multi-monitor\" setups this refers to the width in millimeters for all physical monitors associated with DISPLAY. To get information for each physical -monitor, use `display-monitor-attributes-list'. -If DISPLAY is omitted or nil, it defaults to the selected frame's display." +monitor, use `display-monitor-attributes-list'." (and (memq (framep-on-display display) '(x w32 ns)) (or (cadr (assoc (or display (frame-parameter nil 'display)) display-mm-dimensions-alist)) ------------------------------------------------------------ revno: 116633 committer: Barry O'Reilly branch nick: trunk timestamp: Sun 2014-03-02 12:49:02 -0500 message: * markers.texi (Moving Marker Positions): Clarify guidance about when to move markers and when to create a new one, as discussed at http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16818#17 diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-03-02 03:34:36 +0000 +++ doc/lispref/ChangeLog 2014-03-02 17:49:02 +0000 @@ -1,3 +1,9 @@ +2014-03-02 Barry O'Reilly + + * markers.texi (Moving Marker Positions): Clarify guidance about + when to move markers and when to create a new one, as discussed at + http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16818#17 + 2014-03-02 Glenn Morris * text.texi (Decompression): New node. === modified file 'doc/lispref/markers.texi' --- doc/lispref/markers.texi 2014-01-01 07:43:34 +0000 +++ doc/lispref/markers.texi 2014-03-02 17:49:02 +0000 @@ -344,10 +344,12 @@ @section Moving Marker Positions This section describes how to change the position of an existing -marker. When you do this, be sure you know whether the marker is used -outside of your program, and, if so, what effects will result from -moving it---otherwise, confusing things may happen in other parts of -Emacs. +marker. When you do this, be sure you know how the marker is used +outside of your program. For example, moving a marker to an unrelated +new position can cause undo to later adjust the marker incorrectly. +Often when you wish to relocate a marker to an unrelated position, it +is preferable to make a new marker and set the prior one to point +nowhere. @defun set-marker marker position &optional buffer This function moves @var{marker} to @var{position} ------------------------------------------------------------ revno: 116632 committer: Barry O'Reilly branch nick: trunk timestamp: Sun 2014-03-02 12:37:32 -0500 message: * simple.el (undo-elt-in-region): Fix buffer corruption for edge case of undo in region. * automated/undo-tests.el (undo-test-in-region-not-most-recent): Add new test of undo in region. (undo-test-in-region-eob): Add test case described at http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411#41 diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-02 12:04:29 +0000 +++ lisp/ChangeLog 2014-03-02 17:37:32 +0000 @@ -1,3 +1,8 @@ +2014-03-02 Barry O'Reilly + + * simple.el (undo-elt-in-region): Fix buffer corruption for edge + case of undo in region. + 2014-03-02 Martin Rudalics * window.el (fit-window-to-buffer): Fix argument in window-size === modified file 'lisp/simple.el' --- lisp/simple.el 2014-03-01 03:54:47 +0000 +++ lisp/simple.el 2014-03-02 17:37:32 +0000 @@ -2426,7 +2426,7 @@ ((stringp (car undo-elt)) ;; (TEXT . POSITION) (and (>= (abs (cdr undo-elt)) start) - (< (abs (cdr undo-elt)) end))) + (<= (abs (cdr undo-elt)) end))) ((and (consp undo-elt) (markerp (car undo-elt))) ;; This is a marker-adjustment element (MARKER . ADJUSTMENT). ;; See if MARKER is inside the region. === modified file 'test/ChangeLog' --- test/ChangeLog 2014-02-28 08:47:43 +0000 +++ test/ChangeLog 2014-03-02 17:37:32 +0000 @@ -1,3 +1,10 @@ +2014-03-02 Barry O'Reilly + + * automated/undo-tests.el (undo-test-in-region-not-most-recent): + Add new test of undo in region. + (undo-test-in-region-eob): Add test case described at + http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411 + 2014-02-28 Michael Albinus * automated/tramp-tests.el (tramp--test-enabled) === modified file 'test/automated/undo-tests.el' --- test/automated/undo-tests.el 2014-01-01 07:43:34 +0000 +++ test/automated/undo-tests.el 2014-03-02 17:37:32 +0000 @@ -226,6 +226,48 @@ (should-not (buffer-modified-p)))) (delete-file tempfile)))) +(ert-deftest undo-test-in-region-not-most-recent () + "Test undo in region of an edit not the most recent." + (with-temp-buffer + (buffer-enable-undo) + (transient-mark-mode 1) + (insert "1111") + (undo-boundary) + (goto-char 2) + (insert "2") + (forward-char 2) + (undo-boundary) + (insert "3") + (undo-boundary) + ;; Highlight around "2", not "3" + (push-mark (+ 3 (point-min)) t t) + (setq mark-active t) + (goto-char (point-min)) + (undo) + (should (string= (buffer-string) + "11131")))) + +(ert-deftest undo-test-in-region-eob () + "Test undo in region of a deletion at EOB, demonstrating bug 16411." + (with-temp-buffer + (buffer-enable-undo) + (transient-mark-mode 1) + (insert "This sentence corrupted?") + (undo-boundary) + ;; Same as recipe at + ;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411 + (insert "aaa") + (undo-boundary) + (undo) + ;; Select entire buffer + (push-mark (point) t t) + (setq mark-active t) + (goto-char (point-min)) + ;; Should undo the undo of "aaa", ie restore it. + (undo) + (should (string= (buffer-string) + "This sentence corrupted?aaa")))) + (defun undo-test-all (&optional interactive) "Run all tests for \\[undo]." (interactive "p") ------------------------------------------------------------ revno: 116631 committer: martin rudalics branch nick: trunk timestamp: Sun 2014-03-02 13:04:29 +0100 message: In fit-window-to-buffer fix argument in window-size call. * window.el (fit-window-to-buffer): Fix argument in window-size call when window is horizontally combined. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-02 00:50:07 +0000 +++ lisp/ChangeLog 2014-03-02 12:04:29 +0000 @@ -1,3 +1,8 @@ +2014-03-02 Martin Rudalics + + * window.el (fit-window-to-buffer): Fix argument in window-size + call when window is horizontally combined. + 2014-03-02 Juanma Barranquero * icomplete.el (icomplete-completions): Use string-width. === modified file 'lisp/window.el' --- lisp/window.el 2014-03-01 11:11:13 +0000 +++ lisp/window.el 2014-03-02 12:04:29 +0000 @@ -7237,7 +7237,7 @@ ((and fit-window-to-buffer-horizontally (not (window-size-fixed-p window t)) (window-combined-p nil t)) - (let* ((total-width (window-size window nil pixelwise)) + (let* ((total-width (window-size window t pixelwise)) (min-width ;; Sanitize MIN-WIDTH. (if (numberp min-width) ------------------------------------------------------------ revno: 116630 committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2014-03-02 17:32:46 +0800 message: * doc/misc/sem-user.texi (Create System Databases): Markup fix. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-28 06:25:47 +0000 +++ doc/misc/ChangeLog 2014-03-02 09:32:46 +0000 @@ -1,3 +1,7 @@ +2014-03-02 Xue Fuqiao + + * sem-user.texi (Create System Databases): Markup fix. + 2014-02-28 Glenn Morris * info.texi (Further Reading): Rename node from Expert Info. === modified file 'doc/misc/sem-user.texi' --- doc/misc/sem-user.texi 2014-01-30 03:41:34 +0000 +++ doc/misc/sem-user.texi 2014-03-02 09:32:46 +0000 @@ -483,9 +483,9 @@ summary-mode, or the analyzer. @deffn Command semanticdb-create-ebrowse-database dir -Create an @var{ebrowse} database for directory @var{dir}. -The database file is stored in ~/.semanticdb, or whichever directory -is specified by @code{semanticdb-default-system-save-directory}. +Create an Ebrowse database for directory @var{dir}. The database file +is stored in ~/.semanticdb, or whichever directory is specified by +@code{semanticdb-default-system-save-directory}. @end deffn @node Idle Scheduler ------------------------------------------------------------ revno: 116629 [merge] committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2014-03-02 16:55:23 +0800 message: Document `rectangle-mark-mode'. * doc/emacs/mark.texi (Mark): * doc/emacs/killing.texi (Rectangles): Document `rectangle-mark-mode'. * etc/NEWS: Related edit. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-03-01 02:48:54 +0000 +++ doc/emacs/ChangeLog 2014-03-02 08:54:32 +0000 @@ -1,3 +1,8 @@ +2014-03-02 Xue Fuqiao + + * mark.texi (Mark): + * killing.texi (Rectangles): Document `rectangle-mark-mode'. + 2014-03-01 Glenn Morris * search.texi (Query Replace): Mention search-invisible. === modified file 'doc/emacs/killing.texi' --- doc/emacs/killing.texi 2014-02-17 18:04:17 +0000 +++ doc/emacs/killing.texi 2014-03-02 08:54:32 +0000 @@ -839,6 +839,13 @@ @code{string-rectangle}, but inserts the string on each line, shifting the original text to the right. +@findex rectangle-mark-mode +@cindex rectangular region + The command @kbd{C-x SPC} (@code{rectangle-mark-mode}) makes a +@dfn{rectangular region}. It is a new feature introduced in GNU Emacs +24.4, and most commands now are still unaware of it, but kill and yank +(@pxref{Killing}) do work on the rectangle. + @node CUA Bindings @section CUA Bindings @findex cua-mode === modified file 'doc/emacs/mark.texi' --- doc/emacs/mark.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/mark.texi 2014-03-02 08:54:32 +0000 @@ -43,6 +43,9 @@ if the variable @code{highlight-nonselected-windows} is non-@code{nil}, each window highlights its own region. + There is another kind of region: the ``rectangular region''. +@xref{Rectangles}. + @menu * Setting Mark:: Commands to set the mark. * Marking Objects:: Commands to put region around textual units. === modified file 'etc/NEWS' --- etc/NEWS 2014-03-02 03:34:36 +0000 +++ etc/NEWS 2014-03-02 08:54:32 +0000 @@ -371,6 +371,7 @@ +++ ** Uniquify is enabled by default, with `post-forward-angle-brackets' style. ++++ ** New command `C-x SPC' (`rectangle-mark-mode') makes a rectangular region. Most commands are still unaware of it, but kill/yank do work on the rectangle. ------------------------------------------------------------ revno: 116628 committer: Glenn Morris branch nick: trunk timestamp: Sat 2014-03-01 19:34:36 -0800 message: Document zlib-decompress-region * doc/lispref/text.texi (Decompression): New node. * doc/lispref/elisp.texi (Top): Update detailed menu. * etc/NEWS: Related markup. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-03-01 02:54:08 +0000 +++ doc/lispref/ChangeLog 2014-03-02 03:34:36 +0000 @@ -1,3 +1,8 @@ +2014-03-02 Glenn Morris + + * text.texi (Decompression): New node. + * elisp.texi (Top): Update detailed menu. + 2014-03-01 Glenn Morris * display.texi (Forcing Redisplay): Mention pre-redisplay-function. === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2014-02-28 01:49:25 +0000 +++ doc/lispref/elisp.texi 2014-03-02 03:34:36 +0000 @@ -1138,6 +1138,7 @@ * Registers:: How registers are implemented. Accessing the text or position stored in a register. * Transposition:: Swapping two portions of a buffer. +* Decompression:: Dealing with compressed data. * Base 64:: Conversion to or from base 64 encoding. * Checksum/Hash:: Computing cryptographic hashes. * Parsing HTML/XML:: Parsing HTML and XML. === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2014-02-27 11:59:35 +0000 +++ doc/lispref/text.texi 2014-03-02 03:34:36 +0000 @@ -54,6 +54,7 @@ * Registers:: How registers are implemented. Accessing the text or position stored in a register. * Transposition:: Swapping two portions of a buffer. +* Decompression:: Dealing with compressed data. * Base 64:: Conversion to or from base 64 encoding. * Checksum/Hash:: Computing cryptographic hashes. * Parsing HTML/XML:: Parsing HTML and XML. @@ -4132,6 +4133,35 @@ all markers unrelocated. @end defun +@node Decompression +@section Dealing With Compressed Data + +When @code{auto-compression-mode} is enabled, Emacs automatically +uncompresses compressed files when you visit them, and automatically +recompresses them if you alter and save them. @xref{Compressed +Files,,, emacs, The GNU Emacs Manual}. + +The above feature works by calling an external executable (e.g., +@command{gzip}). Emacs can also be compiled with support for built-in +decompression using the zlib library, which is faster than calling an +external program. + +@defun zlib-available-p +This function returns non-@code{nil} if built-in zlib decompression is +available. +@end defun + +@defun zlib-decompress-region start end +This function decompresses the region between @var{start} and +@var{end}, using built-in zlib decompression. The region should +contain data that were compressed with gzip or zlib. On success, the +function replaces the contents of the region with the decompressed +data. On failure, the function leaves the region unchanged and +returns @code{nil}. This function can be called only in unibyte +buffers. +@end defun + + @node Base 64 @section Base 64 Encoding @cindex base 64 encoding === modified file 'etc/NEWS' --- etc/NEWS 2014-03-01 03:54:47 +0000 +++ etc/NEWS 2014-03-02 03:34:36 +0000 @@ -91,6 +91,7 @@ * Changes in Emacs 24.4 ++++ ** New function `zlib-decompress-region', which decompresses gzip- and zlib-format compressed data using built-in zlib support, if available. ------------------------------------------------------------ revno: 116627 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2014-03-02 01:50:07 +0100 message: lisp/icomplete.el (icomplete-completions): Use string-width. Suggested by Stefan Monier . diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-01 22:04:59 +0000 +++ lisp/ChangeLog 2014-03-02 00:50:07 +0000 @@ -1,3 +1,8 @@ +2014-03-02 Juanma Barranquero + + * icomplete.el (icomplete-completions): Use string-width. + Suggested by Stefan Monier . + 2014-03-01 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight === modified file 'lisp/icomplete.el' --- lisp/icomplete.el 2014-03-01 01:25:29 +0000 +++ lisp/icomplete.el 2014-03-02 00:50:07 +0000 @@ -403,14 +403,14 @@ (substring most compare)) ;; Don't bother truncating if it doesn't gain ;; us at least 2 columns. - ((< compare (+ 2 (length ellipsis))) most) + ((< compare (+ 2 (string-width ellipsis))) most) (t (concat ellipsis (substring most compare)))) close-bracket))) ;;"-prospects" - more than one candidate (prospects-len (+ (string-width (or determ (concat open-bracket close-bracket))) (string-width icomplete-separator) - (+ 2 (length ellipsis)) ;; take {…} into account + (+ 2 (string-width ellipsis)) ;; take {…} into account (string-width (buffer-string)))) (prospects-max ;; Max total length to use, including the minibuffer content. ------------------------------------------------------------ revno: 116626 fixes bug: http://debbugs.gnu.org/16914 committer: Dmitry Gutov branch nick: trunk timestamp: Sun 2014-03-02 00:04:59 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight regexp options. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-01 11:11:13 +0000 +++ lisp/ChangeLog 2014-03-01 22:04:59 +0000 @@ -1,3 +1,8 @@ +2014-03-01 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight + regexp options. (Bug#16914) + 2014-03-01 Martin Rudalics * window.el (window--max-delta-1): Round down when calculating === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2014-02-23 08:26:40 +0000 +++ lisp/progmodes/ruby-mode.el 2014-03-01 22:04:59 +0000 @@ -2132,6 +2132,16 @@ ;; Character literals. ;; FIXME: Support longer escape sequences. ("\\_<\\?\\\\?\\S " 0 font-lock-string-face) + ;; Regexp options. + ("\\(?:\\s|\\|/\\)\\([imxo]+\\)" + 1 (when (save-excursion + (let ((state (syntax-ppss (match-beginning 0)))) + (and (nth 3 state) + (or (eq (char-after) ?/) + (progn + (goto-char (nth 8 state)) + (looking-at "%r")))))) + font-lock-preprocessor-face)) ) "Additional expressions to highlight in Ruby mode.") === modified file 'test/indent/ruby.rb' --- test/indent/ruby.rb 2014-02-25 18:40:54 +0000 +++ test/indent/ruby.rb 2014-03-01 22:04:59 +0000 @@ -29,6 +29,10 @@ # Highlight the regexp after "if". x = toto / foo if /do bar/ =~ "dobar" +# Regexp options are highlighted. + +/foo/xi != %r{bar}mo.tee + bar(class: XXX) do # ruby-indent-keyword-label foo end ------------------------------------------------------------ revno: 116625 committer: martin rudalics branch nick: trunk timestamp: Sat 2014-03-01 20:15:29 +0100 message: Consider Vother_window_scroll_buffer valid iff it's a live buffer. * window.c (Fother_window_for_scrolling): Don't try to scroll a killed Vother_window_scroll_buffer. (Vother_window_scroll_buffer): Fix doc-string accordingly. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-01 11:51:02 +0000 +++ src/ChangeLog 2014-03-01 19:15:29 +0000 @@ -1,3 +1,10 @@ +2014-03-01 Martin Rudalics + + Consider Vother_window_scroll_buffer valid iff it's a live buffer. + * window.c (Fother_window_for_scrolling): Don't try to scroll a + killed Vother_window_scroll_buffer. + (Vother_window_scroll_buffer): Fix doc-string accordingly. + 2014-03-01 Eli Zaretskii * fileio.c (Fexpand_file_name) [WINDOWSNT]: Don't treat file names === modified file 'src/window.c' --- src/window.c 2014-02-27 19:22:10 +0000 +++ src/window.c 2014-03-01 19:15:29 +0000 @@ -5429,8 +5429,9 @@ if (MINI_WINDOW_P (XWINDOW (selected_window)) && !NILP (Vminibuf_scroll_window)) window = Vminibuf_scroll_window; - /* If buffer is specified, scroll that buffer. */ - else if (!NILP (Vother_window_scroll_buffer)) + /* If buffer is specified and live, scroll that buffer. */ + else if (!NILP (Vother_window_scroll_buffer) + && BUFFER_LIVE_P (XBUFFER (Vother_window_scroll_buffer))) { window = Fget_buffer_window (Vother_window_scroll_buffer, Qnil); if (NILP (window)) @@ -7197,7 +7198,7 @@ mode_line_in_non_selected_windows = 1; DEFVAR_LISP ("other-window-scroll-buffer", Vother_window_scroll_buffer, - doc: /* If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window. */); + doc: /* If this is a live buffer, \\[scroll-other-window] should scroll its window. */); Vother_window_scroll_buffer = Qnil; DEFVAR_BOOL ("auto-window-vscroll", auto_window_vscroll_p, ------------------------------------------------------------ revno: 116624 fixes bug: http://debbugs.gnu.org/16751 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-03-01 13:51:02 +0200 message: Fix bug #16751 with crashes in expand-file-name on Windows. src/fileio.c (Fexpand_file_name) [WINDOWSNT]: Don't treat file names that start with more than 2 slashes as UNCs. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-28 21:45:34 +0000 +++ src/ChangeLog 2014-03-01 11:51:02 +0000 @@ -1,3 +1,8 @@ +2014-03-01 Eli Zaretskii + + * fileio.c (Fexpand_file_name) [WINDOWSNT]: Don't treat file names + that start with more than 2 slashes as UNCs. (Bug#16751) + 2014-02-28 Paul Eggert Fix a few crashes and leaks when cloning C strings. === modified file 'src/fileio.c' --- src/fileio.c 2014-01-29 13:21:25 +0000 +++ src/fileio.c 2014-03-01 11:51:02 +0000 @@ -1047,10 +1047,9 @@ nm++; /* Discard any previous drive specifier if nm is now in UNC format. */ - if (IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) - { - drive = 0; - } + if (IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1]) + && !IS_DIRECTORY_SEP (nm[2])) + drive = 0; #endif /* WINDOWSNT */ #endif /* DOS_NT */ @@ -1261,7 +1260,8 @@ && !IS_DIRECTORY_SEP (nm[0]) #endif #ifdef WINDOWSNT - && !(IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) + && !(IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1]) + && !IS_DIRECTORY_SEP (nm[2])) #endif && !newdir) { @@ -1286,7 +1286,8 @@ && IS_DEVICE_SEP (newdir[1]) && IS_DIRECTORY_SEP (newdir[2])) #ifdef WINDOWSNT /* Detect Windows file names in UNC format. */ - && ! (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1])) + && ! (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1]) + && !IS_DIRECTORY_SEP (newdir[2])) #endif ) { @@ -1346,7 +1347,8 @@ if (IS_DIRECTORY_SEP (nm[0]) && collapse_newdir) { #ifdef WINDOWSNT - if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1])) + if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1]) + && !IS_DIRECTORY_SEP (newdir[2])) { char *adir = strcpy (alloca (strlen (newdir) + 1), newdir); char *p = adir + 2; ------------------------------------------------------------ revno: 116623 committer: Glenn Morris branch nick: trunk timestamp: Sat 2014-03-01 06:19:34 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2014-02-01 11:17:37 +0000 +++ lisp/ldefs-boot.el 2014-03-01 11:19:34 +0000 @@ -108,7 +108,7 @@ ;;;*** -;;;### (autoloads nil "add-log" "vc/add-log.el" (21187 63826 213216 +;;;### (autoloads nil "add-log" "vc/add-log.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from vc/add-log.el @@ -238,8 +238,8 @@ ;;;*** -;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21190 39993 -;;;;;; 744837 0)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -377,7 +377,7 @@ ;;;*** -;;;### (autoloads nil "align" "align.el" (21187 63826 213216 0)) +;;;### (autoloads nil "align" "align.el" (21240 46395 727291 0)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -899,7 +899,7 @@ ;;;*** -;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21204 37210 187838 +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from net/ange-ftp.el @@ -1040,7 +1040,7 @@ ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21195 23530 495420 +;;;### (autoloads nil "apropos" "apropos.el" (21259 10807 217062 ;;;;;; 0)) ;;; Generated autoloads from apropos.el @@ -1068,7 +1068,7 @@ (autoload 'apropos-variable "apropos" "\ Show variables that match PATTERN. -When DO-NOT-ALL is not-nil, show user options only, i.e. behave +When DO-NOT-ALL is non-nil, show user options only, i.e. behave like `apropos-user-option'. \(fn PATTERN &optional DO-NOT-ALL)" t nil) @@ -1177,7 +1177,7 @@ ;;;*** -;;;### (autoloads nil "array" "array.el" (21187 63826 213216 0)) +;;;### (autoloads nil "array" "array.el" (21240 46395 727291 0)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1455,8 +1455,8 @@ ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1483,8 +1483,8 @@ ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21257 +;;;;;; 55477 969423 0)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1568,7 +1568,7 @@ ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21187 63826 213216 +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from autoinsert.el @@ -1878,8 +1878,8 @@ ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21264 28773 +;;;;;; 629489 0)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -2320,8 +2320,8 @@ ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2720,8 +2720,8 @@ ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21218 -;;;;;; 19382 890650 0)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2973,7 +2973,7 @@ ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21187 63826 213216 +;;;### (autoloads nil "calculator" "calculator.el" (21231 31415 579137 ;;;;;; 0)) ;;; Generated autoloads from calculator.el @@ -3094,8 +3094,8 @@ ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21213 -;;;;;; 1461 513511 0)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21231 +;;;;;; 31415 579137 0)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3204,8 +3204,8 @@ ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21227 3180 -;;;;;; 84924 320000)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21251 16696 +;;;;;; 39562 0)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3684,8 +3684,8 @@ ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -4006,7 +4006,7 @@ ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (21187 63826 213216 +;;;### (autoloads nil "chistory" "chistory.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from chistory.el @@ -4046,8 +4046,8 @@ ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4177,7 +4177,7 @@ ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21187 63826 213216 +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from cmuscheme.el @@ -4217,7 +4217,7 @@ ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21209 55410 356925 0)) +;;;### (autoloads nil "comint" "comint.el" (21265 49588 918402 0)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4316,8 +4316,8 @@ ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4350,8 +4350,8 @@ ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4532,7 +4532,7 @@ ;;;*** -;;;### (autoloads nil "completion" "completion.el" (21187 63826 213216 +;;;### (autoloads nil "completion" "completion.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from completion.el @@ -4711,7 +4711,7 @@ ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (21187 63826 213216 +;;;### (autoloads nil "cookie1" "play/cookie1.el" (21245 64312 799897 ;;;;;; 0)) ;;; Generated autoloads from play/cookie1.el @@ -5023,39 +5023,29 @@ ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21187 63826 213216 +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21263 7861 493097 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ Read multiple strings in the minibuffer, with completion. -By using this functionality, a user may specify multiple strings at a -single prompt, optionally using completion. - -Multiple strings are specified by separating each of the strings with -a prespecified separator regexp. For example, if the separator -regexp is \",\", the strings 'alice', 'bob', and 'eve' would be -specified as 'alice,bob,eve'. - -The default value for the separator regexp is the value of -`crm-default-separator' (comma). The separator regexp may be -changed by modifying the value of `crm-separator'. - -Contiguous strings of non-separator-characters are referred to as -'elements'. In the aforementioned example, the elements are: 'alice', -'bob', and 'eve'. +The arguments are the same as those of `completing-read'. +\\ +Input multiple strings by separating each one with a string that +matches the regexp `crm-separator'. For example, if the separator +regexp is \",\", entering \"alice,bob,eve\" specifies the strings +\"alice\", \"bob\", and \"eve\". + +We refer to contiguous strings of non-separator-characters as +\"elements\". In this example there are three elements. Completion is available on a per-element basis. For example, if the -contents of the minibuffer are 'alice,bob,eve' and point is between -'l' and 'i', pressing TAB operates on the element 'alice'. +contents of the minibuffer are \"alice,bob,eve\" and point is between +\"l\" and \"i\", pressing \\[minibuffer-complete] operates on the element \"alice\". -The return value of this function is a list of the read strings +This function returns a list of the strings that were read, with empty strings removed. -See the documentation for `completing-read' for details on the arguments: -PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST, DEF, and -INHERIT-INPUT-METHOD. - \(fn PROMPT TABLE &optional PREDICATE REQUIRE-MATCH INITIAL-INPUT HIST DEF INHERIT-INPUT-METHOD)" nil nil) ;;;*** @@ -5071,8 +5061,8 @@ ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21222 52808 -;;;;;; 160149 187000)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21243 49747 +;;;;;; 293438 0)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5129,7 +5119,7 @@ ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21187 63826 213216 +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from cus-edit.el @@ -5362,6 +5352,7 @@ OPTIONS should be an alist of the form ((SYMBOL WIDGET)...), where SYMBOL is a customization option, and WIDGET is a widget for editing that option. +DESCRIPTION is unused. \(fn OPTIONS &optional NAME DESCRIPTION)" nil nil) @@ -5441,7 +5432,7 @@ ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21187 63826 213216 +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from cus-theme.el @@ -5618,7 +5609,7 @@ ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21187 63826 213216 0)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21263 60369 592555 0)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5758,8 +5749,8 @@ ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21194 37048 -;;;;;; 599945 0)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5857,7 +5848,7 @@ ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21227 34360 69622 0)) +;;;### (autoloads nil "delsel" "delsel.el" (21251 41787 268999 0)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5885,8 +5876,8 @@ ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5952,7 +5943,7 @@ ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21187 63826 213216 +;;;### (autoloads nil "descr-text" "descr-text.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from descr-text.el @@ -5987,25 +5978,39 @@ ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21187 63826 213216 +;;;### (autoloads nil "desktop" "desktop.el" (21256 34613 967717 ;;;;;; 0)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ Non-nil if Desktop-Save mode is enabled. -See the command `desktop-save-mode' for a description of this minor mode.") +See the command `desktop-save-mode' for a description of this minor mode. +Setting this variable directly does not take effect; +either customize it (see the info node `Easy Customization') +or call the function `desktop-save-mode'.") (custom-autoload 'desktop-save-mode "desktop" nil) (autoload 'desktop-save-mode "desktop" "\ Toggle desktop saving (Desktop Save mode). -With a prefix argument ARG, enable Desktop Save mode if ARG is -positive, and disable it otherwise. If called from Lisp, enable -the mode if ARG is omitted or nil. - -If Desktop Save mode is enabled, the state of Emacs is saved from -one session to another. See variable `desktop-save' and function -`desktop-read' for details. +With a prefix argument ARG, enable Desktop Save mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode if ARG +is omitted or nil. + +When Desktop Save mode is enabled, the state of Emacs is saved from +one session to another. In particular, Emacs will save the desktop when +it exits (this may prompt you; see the option `desktop-save'). The next +time Emacs starts, if this mode is active it will restore the desktop. + +To manually save the desktop at any time, use the command `M-x desktop-save'. +To load it, use `M-x desktop-read'. + +Once a desktop file exists, Emacs will auto-save it according to the +option `desktop-auto-save-timeout'. + +To see all the options you can set, browse the `desktop' customization group. + +For further details, see info node `(emacs)Saving Emacs Sessions'. \(fn &optional ARG)" t nil) @@ -6254,7 +6259,7 @@ ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (21187 63826 213216 0)) +;;;### (autoloads nil "diff" "vc/diff.el" (21240 46395 727291 0)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6346,7 +6351,7 @@ ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21222 53814 660119 962000)) +;;;### (autoloads nil "dired" "dired.el" (21262 15747 490127 657000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6497,8 +6502,8 @@ ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6512,7 +6517,7 @@ ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21187 63826 213216 +;;;### (autoloads nil "disp-table" "disp-table.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from disp-table.el @@ -6634,8 +6639,8 @@ ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6651,7 +6656,7 @@ ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (21187 63826 213216 0)) +;;;### (autoloads nil "dnd" "dnd.el" (21240 46395 727291 0)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\ @@ -6742,7 +6747,7 @@ ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (21187 63826 213216 +;;;### (autoloads nil "doctor" "play/doctor.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from play/doctor.el @@ -6781,8 +6786,8 @@ ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21259 +;;;;;; 10807 217062 0)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -7326,8 +7331,8 @@ ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7475,7 +7480,7 @@ ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21187 63826 213216 +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from ebuff-menu.el @@ -7508,7 +7513,7 @@ ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (21187 63826 213216 +;;;### (autoloads nil "echistory" "echistory.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from echistory.el @@ -7571,8 +7576,8 @@ ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21205 7349 -;;;;;; 58947 0)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21261 4402 +;;;;;; 232258 508000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -8002,7 +8007,7 @@ ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21187 63826 213216 +;;;### (autoloads nil "edt" "emulation/edt.el" (21260 31670 94248 ;;;;;; 0)) ;;; Generated autoloads from emulation/edt.el @@ -8020,7 +8025,7 @@ ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21187 63826 213216 0)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21240 46395 727291 0)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8124,7 +8129,7 @@ ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (21193 16180 875828 +;;;### (autoloads nil "elec-pair" "elec-pair.el" (21257 55477 969423 ;;;;;; 0)) ;;; Generated autoloads from elec-pair.el @@ -8212,7 +8217,7 @@ ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21187 63826 213216 +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/elp.el @@ -8247,7 +8252,7 @@ ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21187 63826 213216 +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from emacs-lock.el @@ -8275,8 +8280,8 @@ ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21198 34110 -;;;;;; 565653 0)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8287,7 +8292,7 @@ ;;;*** -;;;### (autoloads nil "emerge" "vc/emerge.el" (21032 23080 765139 +;;;### (autoloads nil "emerge" "vc/emerge.el" (21231 31415 579137 ;;;;;; 0)) ;;; Generated autoloads from vc/emerge.el @@ -8384,7 +8389,7 @@ ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21220 61111 156047 0)) +;;;### (autoloads nil "epa" "epa.el" (21235 28473 29431 0)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8719,7 +8724,7 @@ ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21227 34360 69622 0)) +;;;### (autoloads nil "erc" "erc/erc.el" (21240 46395 727291 0)) ;;; Generated autoloads from erc/erc.el (push (purecopy '(erc 5 3)) package--builtin-versions) @@ -8768,35 +8773,35 @@ ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21187 63826 213216 +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8833,8 +8838,8 @@ ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8896,7 +8901,7 @@ ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21187 63826 213216 +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8909,8 +8914,8 @@ ;;;*** -;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8931,8 +8936,8 @@ ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8942,21 +8947,21 @@ ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21187 63826 213216 +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-lang" "erc/erc-lang.el" (21193 16180 875828 +;;;### (autoloads nil "erc-lang" "erc/erc-lang.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-lang.el (push (purecopy '(erc-lang 1 0 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21187 63826 213216 +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-list.el (push (purecopy '(erc-list 0 1)) package--builtin-versions) @@ -8964,7 +8969,7 @@ ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21187 63826 213216 +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8994,8 +8999,8 @@ ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9041,15 +9046,15 @@ ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21187 63826 213216 +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9060,8 +9065,8 @@ ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21260 +;;;;;; 55795 711190 0)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -9078,8 +9083,8 @@ ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9097,36 +9102,36 @@ ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21187 63826 213216 +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21187 63826 213216 +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9143,15 +9148,15 @@ ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9162,22 +9167,22 @@ ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9202,8 +9207,8 @@ ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9222,7 +9227,7 @@ ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21187 63826 213216 +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9234,7 +9239,7 @@ ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21187 63826 213216 +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21261 52533 628241 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/ert.el @@ -9360,7 +9365,7 @@ ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21187 63826 213216 +;;;### (autoloads nil "etags" "progmodes/etags.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from progmodes/etags.el @@ -10165,7 +10170,7 @@ ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (21187 63826 213216 +;;;### (autoloads nil "face-remap" "face-remap.el" (21241 18251 378509 ;;;;;; 0)) ;;; Generated autoloads from face-remap.el @@ -10380,7 +10385,7 @@ ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21187 63826 213216 0)) +;;;### (autoloads nil "ffap" "ffap.el" (21240 46395 727291 0)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10443,7 +10448,7 @@ ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (21187 63826 213216 +;;;### (autoloads nil "filecache" "filecache.el" (21265 49588 918402 ;;;;;; 0)) ;;; Generated autoloads from filecache.el @@ -10514,7 +10519,7 @@ ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21187 63826 213216 +;;;### (autoloads nil "files-x" "files-x.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from files-x.el @@ -10580,7 +10585,7 @@ ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21194 37048 599945 +;;;### (autoloads nil "filesets" "filesets.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from filesets.el @@ -10613,7 +10618,7 @@ ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21187 63826 213216 +;;;### (autoloads nil "find-dired" "find-dired.el" (21264 57319 597552 ;;;;;; 0)) ;;; Generated autoloads from find-dired.el @@ -10630,16 +10635,18 @@ (autoload 'find-name-dired "find-dired" "\ Search DIR recursively for files matching the globbing pattern PATTERN, -and run dired on those files. +and run Dired on those files. PATTERN is a shell wildcard (not an Emacs regexp) and need not be quoted. -The command run (after changing into DIR) is +The default command run (after changing into DIR) is find . -name 'PATTERN' -ls +See `find-name-arg' to customize the arguments. + \(fn DIR PATTERN)" t nil) (autoload 'find-grep-dired "find-dired" "\ -Find files in DIR containing a regexp REGEXP and start Dired on output. +Find files in DIR matching a regexp REGEXP and start Dired on output. The command run (after changing into DIR) is find . \\( -type f -exec `grep-program' `find-grep-options' \\ @@ -10652,7 +10659,7 @@ ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (21187 63826 213216 +;;;### (autoloads nil "find-file" "find-file.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from find-file.el @@ -10743,8 +10750,8 @@ ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21230 +;;;;;; 10550 983182 0)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10923,7 +10930,7 @@ ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21187 63826 213216 0)) +;;;### (autoloads nil "finder" "finder.el" (21264 57319 597552 0)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -10945,7 +10952,7 @@ ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21187 63826 213216 +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from flow-ctrl.el @@ -10983,8 +10990,8 @@ ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21220 61111 -;;;;;; 156047 0)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21245 64312 +;;;;;; 799897 0)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -11014,8 +11021,8 @@ ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11085,14 +11092,14 @@ ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (21187 63826 213216 +;;;### (autoloads nil "foldout" "foldout.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21207 49087 974317 0)) +;;;### (autoloads nil "follow" "follow.el" (21240 46395 727291 0)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11343,7 +11350,7 @@ ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (21187 63826 213216 +;;;### (autoloads nil "frameset" "frameset.el" (21253 58421 377974 ;;;;;; 0)) ;;; Generated autoloads from frameset.el @@ -11500,7 +11507,9 @@ Use \\[jump-to-register] to restore the frameset. Argument is a character, naming the register. -\(fn REGISTER &optional ARG)" t nil) +Interactively, reads the register using `register-read-with-preview'. + +\(fn REGISTER)" t nil) ;;;*** @@ -11511,8 +11520,8 @@ ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -12268,8 +12277,8 @@ ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21235 28473 +;;;;;; 29431 0)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12526,7 +12535,7 @@ ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21187 63826 213216 +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from play/gomoku.el @@ -12553,8 +12562,8 @@ ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12612,7 +12621,7 @@ ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (21187 63826 213216 +;;;### (autoloads nil "grep" "progmodes/grep.el" (21245 64312 799897 ;;;;;; 0)) ;;; Generated autoloads from progmodes/grep.el @@ -12654,8 +12663,9 @@ This variable's value takes effect when `grep-compute-defaults' is called.") (defvar find-program (purecopy "find") "\ -The default find program for `grep-find-command'. -This variable's value takes effect when `grep-compute-defaults' is called.") +The default find program. +This is used by commands like `grep-find-command', `find-dired' +and others.") (defvar xargs-program (purecopy "xargs") "\ The default xargs program for `grep-find-command'. @@ -12776,7 +12786,7 @@ ;;;*** -;;;### (autoloads nil "gs" "gs.el" (21187 63826 213216 0)) +;;;### (autoloads nil "gs" "gs.el" (21240 46395 727291 0)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12789,7 +12799,7 @@ ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21207 49087 974317 +;;;### (autoloads nil "gud" "progmodes/gud.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from progmodes/gud.el @@ -12878,7 +12888,7 @@ ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21187 63826 213216 +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21255 45558 780901 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/gv.el @@ -12924,9 +12934,9 @@ \(fn SYMBOL NAME ARGS HANDLER &optional FIX)" nil nil) -(push `(gv-expander ,(apply-partially #'gv--defun-declaration 'gv-expander)) defun-declarations-alist) +(or (assq 'gv-expander defun-declarations-alist) (push `(gv-expander ,(apply-partially #'gv--defun-declaration 'gv-expander)) defun-declarations-alist)) -(push `(gv-setter ,(apply-partially #'gv--defun-declaration 'gv-setter)) defun-declarations-alist) +(or (assq 'gv-setter defun-declarations-alist) (push `(gv-setter ,(apply-partially #'gv--defun-declaration 'gv-setter)) defun-declarations-alist)) (autoload 'gv-define-setter "gv" "\ Define a setter method for generalized variable NAME. @@ -12999,7 +13009,7 @@ ;;;*** -;;;### (autoloads nil "hanoi" "play/hanoi.el" (20478 3673 653810 +;;;### (autoloads nil "hanoi" "play/hanoi.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from play/hanoi.el @@ -13070,7 +13080,7 @@ ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21187 63826 213216 +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21231 31415 579137 ;;;;;; 0)) ;;; Generated autoloads from help-at-pt.el @@ -13198,7 +13208,7 @@ ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21198 34110 565653 +;;;### (autoloads nil "help-fns" "help-fns.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from help-fns.el @@ -13278,7 +13288,7 @@ ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (21187 63826 213216 +;;;### (autoloads nil "help-macro" "help-macro.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from help-macro.el @@ -13293,7 +13303,7 @@ ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21187 63826 213216 +;;;### (autoloads nil "help-mode" "help-mode.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from help-mode.el @@ -13393,8 +13403,8 @@ ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13409,7 +13419,7 @@ ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21226 13501 706948 0)) +;;;### (autoloads nil "hexl" "hexl.el" (21240 46395 727291 0)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13503,7 +13513,7 @@ ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (21187 63826 213216 +;;;### (autoloads nil "hi-lock" "hi-lock.el" (21236 49338 435234 ;;;;;; 0)) ;;; Generated autoloads from hi-lock.el @@ -13597,9 +13607,8 @@ (autoload 'hi-lock-line-face-buffer "hi-lock" "\ Set face of all lines containing a match of REGEXP to FACE. -Interactively, prompt for REGEXP then FACE. Use -`read-regexp-defaults-function' to customize default -value(s) of REGEXP. Use the global history list for FACE. +Interactively, prompt for REGEXP using `read-regexp', then FACE. +Use the global history list for FACE. Use Font lock mode, if enabled, to highlight REGEXP. Otherwise, use overlays for highlighting. If overlays are used, the @@ -13611,9 +13620,8 @@ (autoload 'hi-lock-face-buffer "hi-lock" "\ Set face of each match of REGEXP to FACE. -Interactively, prompt for REGEXP then FACE. Use -`read-regexp-defaults-function' to customize default -value(s) of REGEXP. Use the global history list for FACE. +Interactively, prompt for REGEXP using `read-regexp', then FACE. +Use the global history list for FACE. Use Font lock mode, if enabled, to highlight REGEXP. Otherwise, use overlays for highlighting. If overlays are used, the @@ -13625,12 +13633,12 @@ (autoload 'hi-lock-face-phrase-buffer "hi-lock" "\ Set face of each match of phrase REGEXP to FACE. -Interactively, prompt for REGEXP then FACE. Use -`read-regexp-defaults-function' to customize default -value(s) of REGEXP. Use the global history list for FACE. When -called interactively, replace whitespace in user provided regexp -with arbitrary whitespace and make initial lower-case letters -case-insensitive before highlighting with `hi-lock-set-pattern'. +Interactively, prompt for REGEXP using `read-regexp', then FACE. +Use the global history list for FACE. + +When called interactively, replace whitespace in user-provided +regexp with arbitrary whitespace, and make initial lower-case +letters case-insensitive, before highlighting with `hi-lock-set-pattern'. Use Font lock mode, if enabled, to highlight REGEXP. Otherwise, use overlays for highlighting. If overlays are used, the @@ -13641,14 +13649,13 @@ (defalias 'highlight-symbol-at-point 'hi-lock-face-symbol-at-point) (autoload 'hi-lock-face-symbol-at-point "hi-lock" "\ -Set face of each match of the symbol at point. -Use `find-tag-default-as-symbol-regexp' to retrieve the symbol at point. -Use non-nil `hi-lock-auto-select-face' to retrieve the next face -from `hi-lock-face-defaults' automatically. +Highlight each instance of the symbol at point. +Uses the next face from `hi-lock-face-defaults' without prompting, +unless you use a prefix argument. +Uses `find-tag-default-as-symbol-regexp' to retrieve the symbol at point. -Use Font lock mode, if enabled, to highlight symbol at point. -Otherwise, use overlays for highlighting. If overlays are used, -the highlighting will not update as you type. +This uses Font lock mode if it is enabled; otherwise it uses overlays, +in which case the highlighting will not update as you type. \(fn)" t nil) @@ -13674,8 +13681,8 @@ ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21223 37302 -;;;;;; 81938 0)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13913,7 +13920,7 @@ ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21224 58166 697544 +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -13946,7 +13953,7 @@ ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (21195 23530 495420 +;;;### (autoloads nil "hl-line" "hl-line.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from hl-line.el @@ -14373,7 +14380,7 @@ ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21187 63826 213216 +;;;### (autoloads nil "icomplete" "icomplete.el" (21265 49588 918402 ;;;;;; 0)) ;;; Generated autoloads from icomplete.el @@ -14392,6 +14399,19 @@ positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. +When this global minor mode is enabled, typing in the minibuffer +continuously displays a list of possible completions that match +the string you have typed. See `icomplete-completions' for a +description of how prospective completions are displayed. + +For more information, see Info node `(emacs)Icomplete'. +For options you can set, `M-x customize-group icomplete'. + +You can use the following key bindings to navigate and select +completions: + +\\{icomplete-minibuffer-map} + \(fn &optional ARG)" t nil) ;;;*** @@ -14592,7 +14612,7 @@ ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21227 34360 69622 0)) +;;;### (autoloads nil "ido" "ido.el" (21251 16696 39562 0)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14851,7 +14871,7 @@ ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21226 13501 706948 0)) +;;;### (autoloads nil "ielm" "ielm.el" (21240 46395 727291 0)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -14879,7 +14899,7 @@ ;;;*** -;;;### (autoloads nil "image" "image.el" (21215 43189 822371 0)) +;;;### (autoloads nil "image" "image.el" (21261 4487 230861 399000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15321,7 +15341,7 @@ ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21187 63826 213216 0)) +;;;### (autoloads nil "imenu" "imenu.el" (21257 55477 969423 0)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15509,7 +15529,7 @@ ;;;*** -;;;### (autoloads nil "info" "info.el" (21203 52022 581300 0)) +;;;### (autoloads nil "info" "info.el" (21263 61769 818166 484000)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -15720,7 +15740,7 @@ ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (21187 63826 213216 +;;;### (autoloads nil "info-look" "info-look.el" (21238 4664 559807 ;;;;;; 0)) ;;; Generated autoloads from info-look.el @@ -15740,7 +15760,7 @@ value into the minibuffer so you can edit it. The default symbol is the one found at point. -With prefix arg a query for the symbol help mode is offered. +With prefix arg MODE a query for the symbol help mode is offered. \(fn SYMBOL &optional MODE)" t nil) (put 'info-lookup-file 'info-file "emacs") @@ -15752,7 +15772,7 @@ into the minibuffer so you can edit it. The default file name is the one found at point. -With prefix arg a query for the file help mode is offered. +With prefix arg MODE a query for the file help mode is offered. \(fn FILE &optional MODE)" t nil) @@ -15852,7 +15872,7 @@ ;;;*** -;;;### (autoloads nil "informat" "informat.el" (21187 63826 213216 +;;;### (autoloads nil "informat" "informat.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from informat.el @@ -15932,7 +15952,7 @@ ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (21187 63826 213216 +;;;### (autoloads nil "isearchb" "isearchb.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -16039,7 +16059,7 @@ ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21240 46395 727291 0)) ;;; Generated autoloads from international/iso-transl.el (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap) @@ -16280,32 +16300,6 @@ ;;;*** -;;;### (autoloads nil "iswitchb" "iswitchb.el" (21187 63826 213216 -;;;;;; 0)) -;;; Generated autoloads from iswitchb.el - -(defvar iswitchb-mode nil "\ -Non-nil if Iswitchb mode is enabled. -See the command `iswitchb-mode' for a description of this minor mode. -Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `iswitchb-mode'.") - -(custom-autoload 'iswitchb-mode "iswitchb" nil) - -(autoload 'iswitchb-mode "iswitchb" "\ -Toggle Iswitchb mode. -With a prefix argument ARG, enable Iswitchb mode if ARG is -positive, and disable it otherwise. If called from Lisp, enable -the mode if ARG is omitted or nil. - -Iswitchb mode is a global minor mode that enables switching -between buffers using substrings. See `iswitchb' for details. - -\(fn &optional ARG)" t nil) - -;;;*** - ;;;### (autoloads nil "japan-util" "language/japan-util.el" (21187 ;;;;;; 63826 213216 0)) ;;; Generated autoloads from language/japan-util.el @@ -16384,8 +16378,8 @@ ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (21208 39894 970127 -;;;;;; 901000)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (21240 46395 727291 +;;;;;; 0)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16408,7 +16402,7 @@ ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21187 63826 213216 +;;;### (autoloads nil "js" "progmodes/js.el" (21243 22582 782931 ;;;;;; 0)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16528,7 +16522,7 @@ ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21187 63826 213216 0)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21244 11875 194797 0)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16540,6 +16534,7 @@ (autoload 'kmacro-exec-ring-item "kmacro" "\ Execute item ITEM from the macro ring. +ARG is the number of times to execute the item. \(fn ITEM ARG)" nil nil) @@ -16808,7 +16803,7 @@ ;;;*** -;;;### (autoloads nil "life" "play/life.el" (21187 63826 213216 0)) +;;;### (autoloads nil "life" "play/life.el" (21240 46395 727291 0)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -16821,7 +16816,7 @@ ;;;*** -;;;### (autoloads nil "linum" "linum.el" (21187 63826 213216 0)) +;;;### (autoloads nil "linum" "linum.el" (21240 46395 727291 0)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -16858,7 +16853,7 @@ ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21187 63826 213216 +;;;### (autoloads nil "loadhist" "loadhist.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from loadhist.el @@ -16942,7 +16937,7 @@ ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21204 16865 279294 +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21239 25528 651427 ;;;;;; 0)) ;;; Generated autoloads from vc/log-edit.el @@ -16985,7 +16980,7 @@ ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (21194 37048 599945 0)) +;;;### (autoloads nil "lpr" "lpr.el" (21240 46395 727291 0)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17080,7 +17075,7 @@ ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21187 63826 213216 +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from ls-lisp.el @@ -17118,7 +17113,7 @@ ;;;*** -;;;### (autoloads nil "macros" "macros.el" (21187 63826 213216 0)) +;;;### (autoloads nil "macros" "macros.el" (21240 46395 727291 0)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17130,7 +17125,8 @@ \(fn SYMBOL)" t nil) (autoload 'insert-kbd-macro "macros" "\ -Insert in buffer the definition of kbd macro NAME, as Lisp code. +Insert in buffer the definition of kbd macro MACRONAME, as Lisp code. +MACRONAME should be a symbol. Optional second arg KEYS means also record the keys it is on \(this is the prefix argument, when calling interactively). @@ -17206,8 +17202,8 @@ ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17267,8 +17263,8 @@ ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17342,8 +17338,8 @@ ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17392,8 +17388,8 @@ ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17459,8 +17455,8 @@ ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17577,7 +17573,7 @@ ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (21187 63826 213216 +;;;### (autoloads nil "makesum" "makesum.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from makesum.el @@ -17589,7 +17585,7 @@ ;;;*** -;;;### (autoloads nil "man" "man.el" (21187 63826 213216 0)) +;;;### (autoloads nil "man" "man.el" (21240 46395 727291 0)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17700,8 +17696,8 @@ ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21199 204 550114 -;;;;;; 319000)) +;;;### (autoloads nil "message" "gnus/message.el" (21239 25528 651427 +;;;;;; 0)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -18174,7 +18170,7 @@ ;;;*** -;;;### (autoloads nil "misc" "misc.el" (21187 63826 213216 0)) +;;;### (autoloads nil "misc" "misc.el" (21240 46395 727291 0)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18202,7 +18198,7 @@ ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (21187 63826 213216 +;;;### (autoloads nil "misearch" "misearch.el" (21245 64312 799897 ;;;;;; 0)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18467,8 +18463,8 @@ ;;;*** -;;;### (autoloads nil "modula2" "progmodes/modula2.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18595,7 +18591,7 @@ ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21187 63826 213216 0)) +;;;### (autoloads nil "msb" "msb.el" (21240 46395 727291 0)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -19087,8 +19083,8 @@ ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21260 +;;;;;; 57908 370145 500000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19225,7 +19221,7 @@ ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21187 63826 213216 0)) +;;;### (autoloads nil "novice" "novice.el" (21240 46395 727291 0)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19257,8 +19253,8 @@ ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19366,8 +19362,8 @@ ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21202 31159 -;;;;;; 541460 0)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -20067,8 +20063,8 @@ ;;;*** -;;;### (autoloads nil "org-version" "org/org-version.el" (21196 19423 -;;;;;; 102965 0)) +;;;### (autoloads nil "org-version" "org/org-version.el" (21260 56437 +;;;;;; 870858 217000)) ;;; Generated autoloads from org/org-version.el (autoload 'org-release "org-version" "\ @@ -20083,12 +20079,9 @@ \(fn)" nil nil) -(defvar org-odt-data-dir "/usr/share/emacs/etc/org" "\ -The location of ODT styles.") - ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21187 63826 213216 +;;;### (autoloads nil "outline" "outline.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) @@ -20150,8 +20143,8 @@ ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21216 7010 -;;;;;; 238506 0)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21242 52061 +;;;;;; 270865 616000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20223,7 +20216,7 @@ ;;;*** -;;;### (autoloads nil "paren" "paren.el" (21187 63826 213216 0)) +;;;### (autoloads nil "paren" "paren.el" (21240 46395 727291 0)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20694,8 +20687,8 @@ ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20756,8 +20749,8 @@ ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -20881,7 +20874,7 @@ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21193 16180 875828 0)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21240 46395 727291 0)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -21877,8 +21870,8 @@ ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "python" "progmodes/python.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 2)) package--builtin-versions) @@ -22661,8 +22654,8 @@ ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22698,8 +22691,8 @@ ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (21222 16439 -;;;;;; 978802 0)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21252 37559 +;;;;;; 125878 0)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -22729,35 +22722,31 @@ \(fn)" nil nil) (autoload 'remember-notes "remember" "\ -Creates notes buffer and switches to it if called interactively. - -If a notes buffer created by a previous invocation of this -function already exist, it will be returned. Otherwise a new -buffer will be created whose content will be read from file -pointed by `remember-data-file'. If a buffer visiting this file -already exist, that buffer will be used instead of creating a new -one (see `find-file-noselect' function for more details). - -Name of the created buffer is taken from `remember-notes-buffer-name' -variable and if a buffer with that name already exist (but was not -created by this function), it will be first killed. -\\ -`remember-notes-mode' is active in the notes buffer which by default -contains only one \\[save-and-bury-buffer] binding which saves and -buries the buffer. - -Function returns notes buffer. When called interactively, -switches to it as well. - -Notes buffer is meant for keeping random notes which you'd like to -preserve across Emacs restarts. The notes will be stored in the -`remember-data-file'. +Return the notes buffer, creating it if needed, and maybe switch to it. +This buffer is for notes that you want to preserve across Emacs sessions. +The notes are saved in `remember-data-file'. + +If a buffer is already visiting that file, just return it. + +Otherwise, create the buffer, and rename it to `remember-notes-buffer-name', +unless a buffer of that name already exists. Set the major mode according +to `remember-notes-initial-major-mode', and enable `remember-notes-mode' +minor mode. + +Use \\\\[remember-notes-save-and-bury-buffer] to save and bury the notes buffer. + +Interactively, or if SWITCH-TO is non-nil, switch to the buffer. +Return the buffer. + +Set `initial-buffer-choice' to `remember-notes' to visit your notes buffer +when Emacs starts. Set `remember-notes-buffer-name' to \"*scratch*\" +to turn the *scratch* buffer into your notes buffer. \(fn &optional SWITCH-TO)" t nil) ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (21187 63826 213216 0)) +;;;### (autoloads nil "repeat" "repeat.el" (21239 25528 651427 0)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -22780,8 +22769,8 @@ ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (21227 3131 80151 -;;;;;; 382000)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -22812,7 +22801,7 @@ ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (21187 63826 213216 +;;;### (autoloads nil "reposition" "reposition.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from reposition.el @@ -22874,7 +22863,7 @@ ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21187 63826 213216 +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/ring.el @@ -22935,8 +22924,8 @@ ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21215 8902 333002 -;;;;;; 878000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21245 3427 941571 +;;;;;; 853000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23133,8 +23122,8 @@ ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23315,7 +23304,7 @@ ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (21187 63826 213216 0)) +;;;### (autoloads nil "rot13" "rot13.el" (21240 46395 727291 0)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23383,8 +23372,8 @@ ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21228 -;;;;;; 55223 319602 0)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21257 +;;;;;; 55477 969423 0)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23395,7 +23384,7 @@ \(fn)" t nil) -(add-to-list 'auto-mode-alist (cons (purecopy (concat "\\(?:\\." "rb\\|ru\\|rake\\|thor" "\\|jbuilder\\|gemspec\\|podspec" "\\|/" "\\(?:Gem\\|Rake\\|Cap\\|Thor" "Vagrant\\|Guard\\|Pod\\)file" "\\)\\'")) 'ruby-mode)) +(add-to-list 'auto-mode-alist (cons (purecopy (concat "\\(?:\\." "rb\\|ru\\|rake\\|thor" "\\|jbuilder\\|gemspec\\|podspec" "\\|/" "\\(?:Gem\\|Rake\\|Cap\\|Thor" "\\|Vagrant\\|Guard\\|Pod\\)file" "\\)\\'")) 'ruby-mode)) (dolist (name (list "ruby" "rbx" "jruby" "ruby1.9" "ruby1.8")) (add-to-list 'interpreter-mode-alist (cons (purecopy name) 'ruby-mode))) @@ -23420,7 +23409,7 @@ ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21193 16180 875828 +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/rx.el @@ -23739,7 +23728,7 @@ ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21187 63826 213216 +;;;### (autoloads nil "savehist" "savehist.el" (21255 13756 851229 ;;;;;; 0)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -23852,8 +23841,8 @@ ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -23869,7 +23858,7 @@ ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (21187 63826 213216 +;;;### (autoloads nil "secrets" "net/secrets.el" (21256 34613 967717 ;;;;;; 0)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) @@ -23957,8 +23946,8 @@ ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21194 37048 -;;;;;; 599945 0)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24239,7 +24228,7 @@ ;;;*** -;;;### (autoloads nil "server" "server.el" (21187 63826 213216 0)) +;;;### (autoloads nil "server" "server.el" (21240 46395 727291 0)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24350,8 +24339,8 @@ ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24416,8 +24405,8 @@ ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21215 -;;;;;; 8729 374161 0)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24570,7 +24559,7 @@ ;;;*** -;;;### (autoloads nil "shell" "shell.el" (21187 63826 213216 0)) +;;;### (autoloads nil "shell" "shell.el" (21240 46395 727291 0)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24618,7 +24607,7 @@ ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21228 55223 319602 0)) +;;;### (autoloads nil "shr" "net/shr.el" (21264 60073 653706 828000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24726,7 +24715,7 @@ ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21187 63826 213216 +;;;### (autoloads nil "skeleton" "skeleton.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from skeleton.el @@ -25046,7 +25035,7 @@ ;;;*** -;;;### (autoloads nil "sort" "sort.el" (21227 34360 69622 0)) +;;;### (autoloads nil "sort" "sort.el" (21240 46395 727291 0)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25303,7 +25292,7 @@ ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (21187 63826 213216 +;;;### (autoloads nil "spook" "play/spook.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from play/spook.el @@ -25319,10 +25308,10 @@ ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21190 39993 744837 -;;;;;; 0)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21263 60346 30834 +;;;;;; 928000)) ;;; Generated autoloads from progmodes/sql.el -(push (purecopy '(sql 3 3)) package--builtin-versions) +(push (purecopy '(sql 3 4)) package--builtin-versions) (autoload 'sql-add-product-keywords "sql" "\ Add highlighting KEYWORDS for SQL PRODUCT. @@ -25825,7 +25814,7 @@ ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21222 16439 978802 +;;;### (autoloads nil "strokes" "strokes.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from strokes.el @@ -25939,7 +25928,7 @@ ;;;*** -;;;### (autoloads nil "studly" "play/studly.el" (20355 10021 546955 +;;;### (autoloads nil "studly" "play/studly.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from play/studly.el @@ -26055,8 +26044,8 @@ ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (21215 9357 -;;;;;; 840145 208000)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -26088,7 +26077,7 @@ ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (21187 63826 213216 +;;;### (autoloads nil "t-mouse" "t-mouse.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from t-mouse.el @@ -26117,7 +26106,7 @@ ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (21187 63826 213216 0)) +;;;### (autoloads nil "tabify" "tabify.el" (21240 46395 727291 0)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -26739,7 +26728,7 @@ ;;;*** -;;;### (autoloads nil "talk" "talk.el" (21187 63826 213216 0)) +;;;### (autoloads nil "talk" "talk.el" (21240 46395 727291 0)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -26754,7 +26743,7 @@ ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (21187 63826 213216 +;;;### (autoloads nil "tar-mode" "tar-mode.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from tar-mode.el @@ -26778,7 +26767,7 @@ ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21187 63826 213216 +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from progmodes/tcl.el @@ -26827,7 +26816,7 @@ ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (21187 63826 213216 +;;;### (autoloads nil "telnet" "net/telnet.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from net/telnet.el @@ -26932,8 +26921,8 @@ ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21199 54969 -;;;;;; 178188 0)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27274,8 +27263,8 @@ ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27387,7 +27376,7 @@ ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (21187 63826 213216 +;;;### (autoloads nil "thingatpt" "thingatpt.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from thingatpt.el @@ -27452,7 +27441,7 @@ ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21187 63826 213216 0)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21240 46395 727291 0)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27585,7 +27574,7 @@ ;;;*** -;;;### (autoloads nil "time" "time.el" (21187 63826 213216 0)) +;;;### (autoloads nil "time" "time.el" (21240 46395 727291 0)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -27933,7 +27922,7 @@ ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (21187 63826 213216 0)) +;;;### (autoloads nil "tmm" "tmm.el" (21240 46395 727291 0)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -28186,7 +28175,7 @@ ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21187 63826 213216 +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/tq.el @@ -28200,8 +28189,8 @@ ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21227 34360 -;;;;;; 69622 0)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -28246,7 +28235,7 @@ ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21209 55410 356925 +;;;### (autoloads nil "tramp" "net/tramp.el" (21263 60369 592555 ;;;;;; 0)) ;;; Generated autoloads from net/tramp.el @@ -28381,7 +28370,7 @@ ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21187 63826 213216 +;;;### (autoloads nil "tutorial" "tutorial.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from tutorial.el @@ -28677,8 +28666,8 @@ ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28698,7 +28687,7 @@ ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21199 54969 178188 +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from mail/unrmail.el @@ -29364,8 +29353,8 @@ ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "userlock" "userlock.el" (21260 57764 872288 +;;;;;; 374000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29735,8 +29724,8 @@ ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21240 46395 +;;;;;; 727291 0)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29784,7 +29773,7 @@ ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21187 63826 213216 +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-bzr.el @@ -29874,7 +29863,7 @@ ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21187 63826 213216 0)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21240 46395 727291 0)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -31091,8 +31080,8 @@ ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21240 +;;;;;; 46395 727291 0)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -31152,6 +31141,7 @@ (autoload 'lwarn "warnings" "\ Display a warning message made from (format MESSAGE ARGS...). +\\ Aside from generating the message with `format', this is equivalent to `display-warning'. @@ -31247,7 +31237,7 @@ ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21222 47372 997188 +;;;### (autoloads nil "whitespace" "whitespace.el" (21255 45558 780901 ;;;;;; 0)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31676,7 +31666,7 @@ ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21197 43194 200483 +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21240 46395 727291 ;;;;;; 0)) ;;; Generated autoloads from wid-edit.el @@ -31795,7 +31785,7 @@ ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21220 61111 156047 0)) +;;;### (autoloads nil "woman" "woman.el" (21240 46395 727291 0)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -32201,8 +32191,8 @@ ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21228 55244 661375 -;;;;;; 865000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21265 49730 375624 +;;;;;; 657000)) ;;;*** ------------------------------------------------------------ revno: 116622 committer: martin rudalics branch nick: trunk timestamp: Sat 2014-03-01 12:11:13 +0100 message: Fix size calculation in window--max-delta-1. * window.el (window--max-delta-1): Round down when calculating how many lines/columns we can get from a window. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-01 02:48:54 +0000 +++ lisp/ChangeLog 2014-03-01 11:11:13 +0000 @@ -1,3 +1,8 @@ +2014-03-01 Martin Rudalics + + * window.el (window--max-delta-1): Round down when calculating + how many lines/columns we can get from a window. + 2014-03-01 Glenn Morris * isearch.el (search-invisible): Doc fix. === modified file 'lisp/window.el' --- lisp/window.el 2014-02-28 09:10:55 +0000 +++ lisp/window.el 2014-03-01 11:11:13 +0000 @@ -1470,7 +1470,7 @@ (setq delta (+ delta (max - (- (window-size sub horizontal pixelwise 'ceiling) + (- (window-size sub horizontal pixelwise 'floor) (window-min-size sub horizontal ignore pixelwise)) 0))))) ------------------------------------------------------------ revno: 116621 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-02-28 19:54:47 -0800 message: * lisp/subr.el (with-wrapper-hook): Tweak obsolescence message. * lisp/simple.el: Remove mistaken FIXME comment. * etc/NEWS: Markup. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-03-01 02:54:08 +0000 +++ etc/NEWS 2014-03-01 03:54:47 +0000 @@ -1295,6 +1295,7 @@ *** `generic-make-keywords-list' *** `get-upcase-table' (use `case-table-get-table' instead). ++++ ** `with-wrapper-hook' is obsoleted by `add-function'. The few hooks that used with-wrapper-hook are replaced as follows: *** `abbrev-expand-function' obsoletes `abbrev-expand-functions'. === modified file 'lisp/simple.el' --- lisp/simple.el 2014-02-21 13:22:14 +0000 +++ lisp/simple.el 2014-03-01 03:54:47 +0000 @@ -3468,7 +3468,6 @@ be copied into other buffers." (funcall filter-buffer-substring-function beg end delete)) -;; FIXME: `with-wrapper-hook' is obsolete (defun buffer-substring--filter (beg end &optional delete) (with-wrapper-hook filter-buffer-substring-functions (beg end delete) (cond === modified file 'lisp/subr.el' --- lisp/subr.el 2014-02-27 14:21:28 +0000 +++ lisp/subr.el 2014-03-01 03:54:47 +0000 @@ -1461,7 +1461,7 @@ to the next hook function, if any. The last (or \"outermost\") FUN is then called once." (declare (indent 2) (debug (form sexp body)) - (obsolete "use a -function variable modified by add-function." + (obsolete "use a -function variable modified by `add-function'." "24.4")) ;; We need those two gensyms because CL's lexical scoping is not available ;; for function arguments :-( ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.