Now on revision 106151. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106151 fixes bug(s): http://debbugs.gnu.org/9771 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-10-20 14:39:52 +0200 message: Improve the speedup of bidi display introduced in revision 106124 for bug#9771. src/dispextern.h (struct bidi_it): New member next_en_type. src/bidi.c (bidi_line_init): Initialize the next_en_type member. (bidi_resolve_explicit_1): When next_en_pos is valid for the current character, check also for next_en_type being WEAK_EN. (bidi_resolve_weak): Don't enter the expensive loop if the current position is before next_en_pos. Record the bidi type of the first non-ET, non-BN character we find, in addition to its position. (bidi_level_of_next_char): Invalidate next_en_type when next_en_pos is over-stepped. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-20 06:52:55 +0000 +++ src/ChangeLog 2011-10-20 12:39:52 +0000 @@ -1,3 +1,16 @@ +2011-10-20 Eli Zaretskii + + * dispextern.h (struct bidi_it): New member next_en_type. + + * bidi.c (bidi_line_init): Initialize the next_en_type member. + (bidi_resolve_explicit_1): When next_en_pos is valid for the + current character, check also for next_en_type being WEAK_EN. + (bidi_resolve_weak): Don't enter the expensive loop if the current + position is before next_en_pos. Record the bidi type of the first + non-ET, non-BN character we find, in addition to its position. + (bidi_level_of_next_char): Invalidate next_en_type when + next_en_pos is over-stepped. + 2011-10-20 Paul Eggert Time zone name fixes for non-ASCII locales (Bug#641, Bug#9794) === modified file 'src/bidi.c' --- src/bidi.c 2011-10-18 16:56:09 +0000 +++ src/bidi.c 2011-10-20 12:39:52 +0000 @@ -849,6 +849,7 @@ /* Setting this to zero will force its recomputation the first time we need it for W5. */ bidi_it->next_en_pos = 0; + bidi_it->next_en_type = UNKNOWN_BT; bidi_it->next_for_ws.type = UNKNOWN_BT; bidi_set_sor_type (bidi_it, (bidi_it->paragraph_dir == R2L ? 1 : 0), @@ -1437,7 +1438,8 @@ } } else if (bidi_it->prev.type_after_w1 == WEAK_EN /* W5/Retaining */ - || bidi_it->next_en_pos > bidi_it->charpos) + || (bidi_it->next_en_pos > bidi_it->charpos + && bidi_it->next_en_type == WEAK_EN)) type = WEAK_EN; break; case LRE: /* X3 */ @@ -1473,7 +1475,8 @@ } } else if (bidi_it->prev.type_after_w1 == WEAK_EN /* W5/Retaining */ - || bidi_it->next_en_pos > bidi_it->charpos) + || (bidi_it->next_en_pos > bidi_it->charpos + && bidi_it->next_en_type == WEAK_EN)) type = WEAK_EN; break; case PDF: /* X7 */ @@ -1499,7 +1502,8 @@ } } else if (bidi_it->prev.type_after_w1 == WEAK_EN /* W5/Retaining */ - || bidi_it->next_en_pos > bidi_it->charpos) + || (bidi_it->next_en_pos > bidi_it->charpos + && bidi_it->next_en_type == WEAK_EN)) type = WEAK_EN; break; default: @@ -1731,10 +1735,15 @@ else if (type == WEAK_ET /* W5: ET with EN before or after it */ || type == WEAK_BN) /* W5/Retaining */ { - if (bidi_it->prev.type_after_w1 == WEAK_EN /* ET/BN w/EN before it */ - || bidi_it->next_en_pos > bidi_it->charpos) + if (bidi_it->prev.type_after_w1 == WEAK_EN) /* ET/BN w/EN before it */ type = WEAK_EN; - else if (bidi_it->next_en_pos >=0) /* W5: ET/BN with EN after it. */ + else if (bidi_it->next_en_pos > bidi_it->charpos + && bidi_it->next_en_type != WEAK_BN) + { + if (bidi_it->next_en_type == WEAK_EN) /* ET/BN with EN after it */ + type = WEAK_EN; + } + else if (bidi_it->next_en_pos >=0) { EMACS_INT en_pos = bidi_it->charpos + bidi_it->nchars; const unsigned char *s = (STRINGP (bidi_it->string.lstring) @@ -1763,25 +1772,27 @@ en_pos = bidi_it->charpos; bidi_copy_it (bidi_it, &saved_it); } + /* Remember this position, to speed up processing of the + next ETs. */ + bidi_it->next_en_pos = en_pos; if (type_of_next == WEAK_EN) { /* If the last strong character is AL, the EN we've found will become AN when we get to it (W2). */ - if (bidi_it->last_strong.type_after_w1 != STRONG_AL) - { - type = WEAK_EN; - /* Remember this EN position, to speed up processing - of the next ETs. */ - bidi_it->next_en_pos = en_pos; - } + if (bidi_it->last_strong.type_after_w1 == STRONG_AL) + type_of_next = WEAK_AN; else if (type == WEAK_BN) type = NEUTRAL_ON; /* W6/Retaining */ + else + type = WEAK_EN; } else if (type_of_next == NEUTRAL_B) /* Record the fact that there are no more ENs from here to the end of paragraph, to avoid entering the loop above ever again in this paragraph. */ bidi_it->next_en_pos = -1; + /* Record the type of the character where we ended our search. */ + bidi_it->next_en_type = type_of_next; } } } @@ -2053,7 +2064,10 @@ bidi_it->next_for_neutral.type = UNKNOWN_BT; if (bidi_it->next_en_pos >= 0 && bidi_it->charpos >= bidi_it->next_en_pos) - bidi_it->next_en_pos = 0; + { + bidi_it->next_en_pos = 0; + bidi_it->next_en_type = UNKNOWN_BT; + } if (bidi_it->next_for_ws.type != UNKNOWN_BT && bidi_it->charpos >= bidi_it->next_for_ws.charpos) bidi_it->next_for_ws.type = UNKNOWN_BT; === modified file 'src/dispextern.h' --- src/dispextern.h 2011-09-21 08:13:18 +0000 +++ src/dispextern.h 2011-10-20 12:39:52 +0000 @@ -1856,7 +1856,8 @@ struct bidi_saved_info next_for_neutral; /* surrounding characters for... */ struct bidi_saved_info prev_for_neutral; /* ...resolving neutrals */ struct bidi_saved_info next_for_ws; /* character after sequence of ws */ - EMACS_INT next_en_pos; /* position of next EN char for ET */ + EMACS_INT next_en_pos; /* pos. of next char for determining ET type */ + bidi_type_t next_en_type; /* type of char at next_en_pos */ EMACS_INT ignore_bn_limit; /* position until which to ignore BNs */ bidi_dir_t sor; /* direction of start-of-run in effect */ int scan_dir; /* direction of text scan, 1: forw, -1: back */ ------------------------------------------------------------ revno: 106150 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-10-20 06:20:23 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-10-19 10:18:49 +0000 +++ autogen/configure 2011-10-20 10:20:23 +0000 @@ -8803,116 +8803,6 @@ done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 -$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test "${ac_cv_struct_tm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include - -int -main () -{ -struct tm tm; - int *p = &tm.tm_sec; - return !p; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_tm=time.h -else - ac_cv_struct_tm=sys/time.h -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 -$as_echo "$ac_cv_struct_tm" >&6; } -if test $ac_cv_struct_tm = sys/time.h; then - -$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h - -fi - -ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include -#include <$ac_cv_struct_tm> - -" -if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TM_TM_ZONE 1 -_ACEOF - - -fi - -if test "$ac_cv_member_struct_tm_tm_zone" = yes; then - -$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h - -else - ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include -" -if test "x$ac_cv_have_decl_tzname" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_TZNAME $ac_have_decl -_ACEOF - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 -$as_echo_n "checking for tzname... " >&6; } -if test "${ac_cv_var_tzname+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#if !HAVE_DECL_TZNAME -extern char *tzname[]; -#endif - -int -main () -{ -return tzname[0][0]; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_var_tzname=yes -else - ac_cv_var_tzname=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5 -$as_echo "$ac_cv_var_tzname" >&6; } - if test $ac_cv_var_tzname = yes; then - -$as_echo "#define HAVE_TZNAME 1" >>confdefs.h - - fi -fi - -ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include -" -if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then : - -$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h - -fi - ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_flags" "ac_cv_member_struct_ifreq_ifr_flags" "$ac_includes_default #if HAVE_SYS_SOCKET_H #include @@ -18884,6 +18774,108 @@ REPLACE_VSNPRINTF=0; REPLACE_VSPRINTF=0; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +if test "${ac_cv_struct_tm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include + +int +main () +{ +struct tm tm; + int *p = &tm.tm_sec; + return !p; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_tm=time.h +else + ac_cv_struct_tm=sys/time.h +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 +$as_echo "$ac_cv_struct_tm" >&6; } +if test $ac_cv_struct_tm = sys/time.h; then + +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h + +fi + +ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include +#include <$ac_cv_struct_tm> + +" +if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TM_TM_ZONE 1 +_ACEOF + + +fi + +if test "$ac_cv_member_struct_tm_tm_zone" = yes; then + +$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h + +else + ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include +" +if test "x$ac_cv_have_decl_tzname" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_TZNAME $ac_have_decl +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 +$as_echo_n "checking for tzname... " >&6; } +if test "${ac_cv_var_tzname+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#if !HAVE_DECL_TZNAME +extern char *tzname[]; +#endif + +int +main () +{ +return tzname[0][0]; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_var_tzname=yes +else + ac_cv_var_tzname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5 +$as_echo "$ac_cv_var_tzname" >&6; } + if test $ac_cv_var_tzname = yes; then + +$as_echo "#define HAVE_TZNAME 1" >>confdefs.h + + fi +fi + ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include " ------------------------------------------------------------ revno: 106149 fixes bug(s): http://debbugs.gnu.org/641 http://debbugs.gnu.org/9794 committer: Paul Eggert branch nick: trunk timestamp: Wed 2011-10-19 23:52:55 -0700 message: Time zone name fixes for non-ASCII locales (Bug#641, Bug#9794) * configure.in (AC_STRUCT_TM, AC_STRUCT_TIMEZONE, HAVE_TM_GMTOFF): Remove; no longer needed, now that we defer to strftime for time zone names. * src/editfns.c: Rewrite current-time-zone so that it invokes the equivalent of (format-time-string "%Z") to get the time zone name. This fixes a bug when the time zone name contains characters that need converting from the system time locale to Emacs internal format. This fixes a shortcoming that I introduced in my 1999-10-19 patch: that patch fixed format-time-string to do the conversion, but I forgot to fix current-time-zone. (format_time_string): New function, containing most of what Fformat_time_string used to contain. (Fformat_time_string): Rewrite in terms of format_time_string. This doesn't change this function's behavior. (current-time-zone): Rewrite to use format_time_string. This fixes the bug reported by Michael Schierl in . Jason Rumney's 2007-06-07 change worked around this bug, but didn't fix it. * src/systime.h (tzname, timezone): Remove no-longer-used declarations. diff: === modified file 'ChangeLog' --- ChangeLog 2011-10-18 18:12:53 +0000 +++ ChangeLog 2011-10-20 06:52:55 +0000 @@ -1,3 +1,10 @@ +2011-10-20 Paul Eggert + + Time zone name fixes for non-ASCII locales (Bug#641, Bug#9794) + * configure.in (AC_STRUCT_TM, AC_STRUCT_TIMEZONE, HAVE_TM_GMTOFF): + Remove; no longer needed, now that we defer to strftime for time + zone names. + 2011-10-18 Jan Djärv * configure.in (GLIB_REQUIRED, GTK_REQUIRED): Set to 2.10 (Bug#9786). === modified file 'configure.in' --- configure.in 2011-10-18 18:12:53 +0000 +++ configure.in 2011-10-20 06:52:55 +0000 @@ -1315,12 +1315,6 @@ AC_CHECK_FUNCS(getifaddrs freeifaddrs) dnl checks for structure members -AC_STRUCT_TM -AC_STRUCT_TIMEZONE -AC_CHECK_MEMBER(struct tm.tm_gmtoff, - [AC_DEFINE(HAVE_TM_GMTOFF, 1, - [Define to 1 if `tm_gmtoff' is member of `struct tm'.])],, - [#include ]) AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr, struct ifreq.ifr_netmask, struct ifreq.ifr_broadaddr, struct ifreq.ifr_addr, === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-19 11:46:17 +0000 +++ src/ChangeLog 2011-10-20 06:52:55 +0000 @@ -1,3 +1,24 @@ +2011-10-20 Paul Eggert + + Time zone name fixes for non-ASCII locales (Bug#641, Bug#9794) + * editfns.c: Rewrite current-time-zone so that it invokes + the equivalent of (format-time-string "%Z") to get the time zone name. + This fixes a bug when the time zone name contains characters that + need converting from the system time locale to Emacs internal format. + This fixes a shortcoming that I introduced in my 1999-10-19 patch: + that patch fixed format-time-string to do the conversion, but + I forgot to fix current-time-zone. + (format_time_string): New function, containing most of + what Fformat_time_string used to contain. + (Fformat_time_string): Rewrite in terms of format_time_string. + This doesn't change this function's behavior. + (current-time-zone): Rewrite to use format_time_string. + This fixes the bug reported by Michael Schierl in + . + Jason Rumney's 2007-06-07 change worked around this bug, but + didn't fix it. + * systime.h (tzname, timezone): Remove no-longer-used declarations. + 2011-10-19 Eli Zaretskii * xdisp.c (start_display): If the character at POS is displayed === modified file 'src/editfns.c' --- src/editfns.c 2011-10-13 14:55:46 +0000 +++ src/editfns.c 2011-10-20 06:52:55 +0000 @@ -85,6 +85,8 @@ #endif static void time_overflow (void) NO_RETURN; +static Lisp_Object format_time_string (char const *, ptrdiff_t, Lisp_Object, + int, time_t *, struct tm **); static int tm_diff (struct tm *, struct tm *); static void update_buffer_properties (EMACS_INT, EMACS_INT); @@ -1700,33 +1702,41 @@ usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL) */) (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal) { - time_t value; + time_t t; + struct tm *tm; + + CHECK_STRING (format_string); + format_string = code_convert_string_norecord (format_string, + Vlocale_coding_system, 1); + return format_time_string (SSDATA (format_string), SBYTES (format_string), + timeval, ! NILP (universal), &t, &tm); +} + +static Lisp_Object +format_time_string (char const *format, ptrdiff_t formatlen, + Lisp_Object timeval, int ut, time_t *tval, struct tm **tmp) +{ ptrdiff_t size; int usec; int ns; struct tm *tm; - int ut = ! NILP (universal); - - CHECK_STRING (format_string); - - if (! (lisp_time_argument (timeval, &value, &usec) + + if (! (lisp_time_argument (timeval, tval, &usec) && 0 <= usec && usec < 1000000)) error ("Invalid time specification"); ns = usec * 1000; - format_string = code_convert_string_norecord (format_string, - Vlocale_coding_system, 1); - /* This is probably enough. */ - size = SBYTES (format_string); + size = formatlen; if (size <= (STRING_BYTES_BOUND - 50) / 6) size = size * 6 + 50; BLOCK_INPUT; - tm = ut ? gmtime (&value) : localtime (&value); + tm = ut ? gmtime (tval) : localtime (tval); UNBLOCK_INPUT; if (! tm) time_overflow (); + *tmp = tm; synchronize_system_time_locale (); @@ -1737,9 +1747,7 @@ buf[0] = '\1'; BLOCK_INPUT; - result = emacs_nmemftime (buf, size, SSDATA (format_string), - SBYTES (format_string), - tm, ut, ns); + result = emacs_nmemftime (buf, size, format, formatlen, tm, ut, ns); UNBLOCK_INPUT; if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0')) return code_convert_string_norecord (make_unibyte_string (buf, result), @@ -1747,9 +1755,7 @@ /* If buffer was too small, make it bigger and try again. */ BLOCK_INPUT; - result = emacs_nmemftime (NULL, (size_t) -1, - SSDATA (format_string), - SBYTES (format_string), + result = emacs_nmemftime (NULL, (size_t) -1, format, formatlen, tm, ut, ns); UNBLOCK_INPUT; if (STRING_BYTES_BOUND <= result) @@ -1994,51 +2000,34 @@ { time_t value; struct tm *t; - struct tm gmt; + struct tm localtm; + struct tm *localt; + Lisp_Object zone_offset, zone_name; - if (!lisp_time_argument (specified_time, &value, NULL)) - t = NULL; - else - { - BLOCK_INPUT; - t = gmtime (&value); - if (t) - { - gmt = *t; - t = localtime (&value); - } - UNBLOCK_INPUT; - } + zone_offset = Qnil; + zone_name = format_time_string ("%Z", sizeof "%Z" - 1, specified_time, + 0, &value, &localt); + localtm = *localt; + BLOCK_INPUT; + t = gmtime (&value); + UNBLOCK_INPUT; if (t) { - int offset = tm_diff (t, &gmt); - char *s = 0; - char buf[sizeof "+00" + INT_STRLEN_BOUND (int)]; - -#ifdef HAVE_TM_ZONE - if (t->tm_zone) - s = (char *)t->tm_zone; -#else /* not HAVE_TM_ZONE */ -#ifdef HAVE_TZNAME - if (t->tm_isdst == 0 || t->tm_isdst == 1) - s = tzname[t->tm_isdst]; -#endif -#endif /* not HAVE_TM_ZONE */ - - if (!s) + int offset = tm_diff (&localtm, t); + zone_offset = make_number (offset); + if (SCHARS (zone_name) == 0) { /* No local time zone name is available; use "+-NNNN" instead. */ int m = offset / 60; int am = offset < 0 ? - m : m; + char buf[sizeof "+00" + INT_STRLEN_BOUND (int)]; sprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60, am%60); - s = buf; + zone_name = build_string (buf); } - - return Fcons (make_number (offset), Fcons (build_string (s), Qnil)); } - else - return Fmake_list (make_number (2), Qnil); + + return list2 (zone_offset, zone_name); } /* This holds the value of `environ' produced by the previous === modified file 'src/systime.h' --- src/systime.h 2011-05-20 06:37:13 +0000 +++ src/systime.h 2011-10-20 06:52:55 +0000 @@ -38,17 +38,6 @@ # endif #endif -#ifdef HAVE_TZNAME -#ifndef tzname /* For SGI. */ -extern char *tzname[]; /* RS6000 and others want it this way. */ -#endif -#endif - -/* SVr4 doesn't actually declare this in its #include files. */ -#ifdef USG5_4 -extern time_t timezone; -#endif - /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h disagree about the name of the guard symbol. */ #ifdef HPUX ------------------------------------------------------------ revno: 106148 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-19 21:16:51 -0700 message: Fix ChangeLog attribution. This was clearly a tiny change, ref: http://article.gmane.org/gmane.emacs.gnus.cvs/8206 diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-20 04:09:12 +0000 +++ lisp/gnus/ChangeLog 2011-10-20 04:16:51 +0000 @@ -13109,13 +13109,11 @@ (mml-secure-cache-passphrase): New user option. (mml-secure-passphrase-cache-expiry): New user option. -2006-07-24 Daiki Ueno - - * pgg-def.el (pgg-truncate-key-identifier): Truncate the key ID to 8 - letters from the end. Thanks to "David Smith" and - andreas@altroot.de (Andreas Vögele). - - FIXME: Use `tiny change'? +2006-07-24 David Smith (tiny change) + Andreas Vögele (tiny change) + + * pgg-def.el (pgg-truncate-key-identifier): + Truncate the key ID to 8 letters from the end. 2006-07-19 Andreas Seltenreich ------------------------------------------------------------ revno: 106147 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-19 21:09:12 -0700 message: Fix ChangeLog attribution. All 4 listed authors have assignments, so I am not going to bother working out precisely who wrote which piece of this. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-20 04:05:36 +0000 +++ lisp/gnus/ChangeLog 2011-10-20 04:09:12 +0000 @@ -20231,13 +20231,10 @@ * spam-stat.el (spam-stat-score-buffer): Simplify mapcar usage. Use mapc when appropriate. -2004-04-22 Teodor Zlatanov - - FIXME: Make separate entries for each person. - - From Dan Christensen , asjo@koldfront.dk (Adam - Sjøgren), Wes Hardaker , and Michael Shields - : +2004-04-22 Dan Christensen + Adam Sjøgren + Wes Hardaker + Michael Shields * spam.el (spam-necessary-extra-headers): Get the extra headers we may need for spam sorting and scoring. @@ -20247,7 +20244,7 @@ sorting. (spam-extra-header-to-number): Add function to get a score from a header. - (spam-summary-score): Add function to get a numeric score from the + (spam-summary-score): Add function to get a numeric score from the headers. (spam-generic-score): Fix function doc, was in wrong place. (spam-initialize): Take symbols when it's run, and install the ------------------------------------------------------------ revno: 106146 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-19 21:05:36 -0700 message: Fix ChangeLog attribution. Ref: http://thread.gmane.org/gmane.emacs.gnus.general/56492/focus=57459 From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de> Subject: Re: display picons _and_ textual address Newsgroups: gmane.emacs.gnus.general Date: 2004-05-18 12:21:19 GMT diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-20 03:58:45 +0000 +++ lisp/gnus/ChangeLog 2011-10-20 04:05:36 +0000 @@ -19966,10 +19966,13 @@ 2004-05-18 Reiner Steib + * gnus-picon.el (gnus-picon-insert-glyph): + Add optional `nostring' argument. + +2004-05-18 Jesper Harder + * gnus-picon.el (gnus-picon-style): New variable. - (gnus-picon-insert-glyph): Add optional `nostring' argument. (gnus-picon-transform-address): Support `gnus-picon-style'. - From Jesper Harder . 2004-05-18 Lars Magne Ingebrigtsen ------------------------------------------------------------ revno: 106145 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-19 20:58:45 -0700 message: Fix ChangeLog attribution. Ref: http://thread.gmane.org/gmane.emacs.gnus.general/56861/focus=56907 From: Ted Zlatanov Subject: Re: CRM114 Mailfilter and spam.el Newsgroups: gmane.emacs.gnus.general Date: 2004-05-20 18:39:25 GMT diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-20 03:50:14 +0000 +++ lisp/gnus/ChangeLog 2011-10-20 03:58:45 +0000 @@ -19811,7 +19811,7 @@ * dns.el (dns-read-type): Add support for SVR. (small patch) -2004-05-20 Teodor Zlatanov +2004-05-20 Adam Sjøgren * spam.el (spam-use-crm114, spam-crm114, spam-crm114-program) (spam-crm114-header, spam-crm114-spam-switch) @@ -19828,7 +19828,8 @@ (spam-crm114-unregister-spam-routine) (spam-crm114-register-ham-routine) (spam-crm114-unregister-ham-routine): Add CRM114 support. - From asjo@koldfront.dk (Adam Sjøgren). + +2004-05-20 Teodor Zlatanov * gnus.el: Add spam-use-crm114. ------------------------------------------------------------ revno: 106144 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-19 20:50:14 -0700 message: Fix ChangeLog attribution, add bug ref. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-20 00:26:14 +0000 +++ lisp/gnus/ChangeLog 2011-10-20 03:50:14 +0000 @@ -14,9 +14,9 @@ * nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy. * nnmairix.el (gnus-registry-enabled): Ditto. -2011-10-17 Teodor Zlatanov +2011-10-17 Dave Abrahams - * gnus-registry.el (gnus-registry-enabled): Add new variable. + * gnus-registry.el (gnus-registry-enabled): Add new variable. (Bug#9691) (gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask only while we need to find out if it should be t or nil. (gnus-registry-initialize): Don't set `gnus-registry-install' to t. @@ -30,7 +30,6 @@ Use `gnus-registry-enabled' instead of `gnus-registry-install'. * nnir.el (nnir-mode): Use `gnus-registry-enabled' instead of `gnus-registry-install'. - From Dave Abrahams . 2011-10-17 Daiki Ueno ------------------------------------------------------------ revno: 106143 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-19 20:39:45 -0700 message: * test/automated/vc-bzr.el: New file. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2011-10-15 20:56:02 +0000 +++ test/ChangeLog 2011-10-20 03:39:45 +0000 @@ -1,3 +1,7 @@ +2011-10-20 Glenn Morris + + * automated/vc-bzr.el: New file. + 2011-10-15 Glenn Morris * automated/f90.el: New file. === added file 'test/automated/vc-bzr.el' --- test/automated/vc-bzr.el 1970-01-01 00:00:00 +0000 +++ test/automated/vc-bzr.el 2011-10-20 03:39:45 +0000 @@ -0,0 +1,64 @@ +;;; vc-bzr.el --- tests for vc/vc-bzr.el + +;; Copyright (C) 2011 Free Software Foundation, Inc. + +;; Author: Glenn Morris + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;;; Code: + +(require 'ert) +(require 'vc-bzr) +(require 'vc-dir) + +;; FIXME it would be better to skip all these tests if there is no +;; bzr installed. We could just put everything inside an IF +;; statement, but it would be nice if ERT had a "skipped" facility (?). + +(ert-deftest vc-bzr-test-bug9726 () + "Test for http://debbugs.gnu.org/9726 ." + :expected-result (if (executable-find vc-bzr-program) :passed :failed) + (should (executable-find vc-bzr-program)) + (let* ((tempdir (make-temp-file "vc-bzr-test" t)) + (ignored-dir (expand-file-name "ignored-dir" tempdir)) + (default-directory (file-name-as-directory tempdir))) + (unwind-protect + (progn + (make-directory ignored-dir) + (with-temp-buffer + (insert (file-name-nondirectory ignored-dir)) + (write-region nil nil (expand-file-name ".bzrignore" tempdir) + nil 'silent)) + (call-process vc-bzr-program nil nil nil "init") + (call-process vc-bzr-program nil nil nil "add") + (call-process vc-bzr-program nil nil nil "commit" "-m" "Commit 1") + (with-temp-buffer + (insert "unregistered file") + (write-region nil nil (expand-file-name "testfile2" ignored-dir) + nil 'silent)) + (vc-dir ignored-dir) + (while (vc-dir-busy) + (sit-for 0.1)) + ;; FIXME better to explicitly test for error from process sentinel. + (with-current-buffer "*vc-dir*" + (goto-char (point-min)) + (should (search-forward "unregistered" nil t)))) + (delete-directory tempdir t)))) + +;;; vc-bzr.el ends here ------------------------------------------------------------ revno: 106142 committer: Christoph Scholtes branch nick: trunk timestamp: Wed 2011-10-19 19:40:32 -0600 message: * emulation/cua-base.el (cua-set-mark): Fix case of string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-20 00:26:14 +0000 +++ lisp/ChangeLog 2011-10-20 01:40:32 +0000 @@ -1,3 +1,7 @@ +2011-10-20 Christoph Scholtes + + * emulation/cua-base.el (cua-set-mark): Fix case of string. + 2011-10-20 Chong Yidong * emulation/cua-base.el (cua-mode): === modified file 'lisp/emulation/cua-base.el' --- lisp/emulation/cua-base.el 2011-10-20 00:26:14 +0000 +++ lisp/emulation/cua-base.el 2011-10-20 01:40:32 +0000 @@ -1121,7 +1121,7 @@ (pop-to-mark-command))) ((and cua-toggle-set-mark mark-active) (cua--deactivate) - (message "Mark Cleared")) + (message "Mark cleared")) (t (push-mark-command nil nil) (setq cua--explicit-region-start t) ------------------------------------------------------------ revno: 106141 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-10-19 20:41:15 -0400 message: Adapt to new minor mode function behavior in manual examples. * doc/emacs/custom.texi (Hooks, Init Examples): * doc/emacs/display.texi (Font Lock): * doc/emacs/fixit.texi (Spelling): * doc/emacs/rmail.texi (Rmail Display): Minor mode function with no arg now enables it. * doc/emacs/fixit.texi (Spelling): Fix description of inline completion. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-19 04:21:52 +0000 +++ doc/emacs/ChangeLog 2011-10-20 00:41:15 +0000 @@ -1,3 +1,13 @@ +2011-10-20 Chong Yidong + + * custom.texi (Hooks, Init Examples): + * display.texi (Font Lock): + * fixit.texi (Spelling): + * rmail.texi (Rmail Display): Minor mode function with no arg now + enables it. + + * fixit.texi (Spelling): Fix description of inline completion. + 2011-10-19 Chong Yidong * search.texi (Repeat Isearch, Error in Isearch): Add kindex === modified file 'doc/emacs/custom.texi' --- doc/emacs/custom.texi 2011-10-01 21:54:33 +0000 +++ doc/emacs/custom.texi 2011-10-20 00:41:15 +0000 @@ -770,7 +770,7 @@ Text mode and other modes based on Text mode: @example -(add-hook 'text-mode-hook 'turn-on-auto-fill) +(add-hook 'text-mode-hook 'auto-fill-mode) @end example Here is another example, showing how to use a hook to customize the @@ -2174,8 +2174,7 @@ Turn on Auto Fill mode automatically in Text mode and related modes. @example -(add-hook 'text-mode-hook - '(lambda () (auto-fill-mode 1))) +(add-hook 'text-mode-hook 'auto-fill-mode) @end example This shows how to add a hook function to a normal hook variable @@ -2183,19 +2182,9 @@ @code{lambda}, with a single-quote in front of it to make it a list constant rather than an expression. -It's beyond the scope of this manual to explain Lisp functions, but for -this example it is enough to know that the effect is to execute -@code{(auto-fill-mode 1)} when Text mode is entered. You can replace -that with any other expression that you like, or with several -expressions in a row. - -Emacs comes with a function named @code{turn-on-auto-fill} whose -definition is @code{(lambda () (auto-fill-mode 1))}. Thus, a simpler -way to write the above example is as follows: - -@example -(add-hook 'text-mode-hook 'turn-on-auto-fill) -@end example +It's beyond the scope of this manual to explain Lisp functions, but +for this example it is enough to know that the effect is to execute +the @code{auto-fill-mode} function when Text mode is entered. @item Load the installed Lisp library named @file{foo} (actually a file === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-10-18 21:11:17 +0000 +++ doc/emacs/display.texi 2011-10-20 00:41:15 +0000 @@ -703,16 +703,14 @@ (global-font-lock-mode 0) @end example -@findex turn-on-font-lock @noindent If you have disabled Global Font Lock mode, you can still enable Font Lock for specific major modes by adding the function -@code{turn-on-font-lock} to the mode hooks (@pxref{Hooks}). For -example, to enable Font Lock mode for editing C files, you can do -this: +@code{font-lock-mode} to the mode hooks (@pxref{Hooks}). For example, +to enable Font Lock mode for editing C files, you can do this: @example -(add-hook 'c-mode-hook 'turn-on-font-lock) +(add-hook 'c-mode-hook 'font-lock-mode) @end example Font Lock mode uses several specifically named faces to do its job, === modified file 'doc/emacs/fixit.texi' --- doc/emacs/fixit.texi 2011-10-12 17:38:34 +0000 +++ doc/emacs/fixit.texi 2011-10-20 00:41:15 +0000 @@ -7,17 +7,14 @@ @cindex typos, fixing @cindex mistakes, correcting - In this chapter we describe the commands that are especially useful -when you catch a mistake in your text after you have made it, or -change your mind while composing text on the fly. - - The most fundamental command for correcting erroneous editing is the -undo command @kbd{C-/} (which is also bound to @kbd{C-x u} and -@kbd{C-_}). This undoes a single command, or a part of a command (as -in the case of @code{query-replace}), or several consecutive -self-inserting characters. Consecutive repetitions of @kbd{C-/} undo -earlier and earlier changes, back to the limit of the undo information -available. + In this chapter we describe commands that are useful when you catch +a mistake while editing. The most fundamental command for correcting +erroneous editing is the undo command @kbd{C-/} (which is also bound +to @kbd{C-x u} and @kbd{C-_}). This undoes a single command, or a +part of a command (as in the case of @code{query-replace}), or several +consecutive character insertions. Consecutive repetitions of +@kbd{C-/} undo earlier and earlier changes, back to the limit of the +undo information available. Aside from the commands described here, you can erase text using deletion commands such as @key{DEL} (@code{delete-backward-char}). @@ -231,18 +228,19 @@ This section describes the commands to check the spelling of a single word or of a portion of a buffer. These commands only work if the spelling checker program Aspell, Ispell or Hunspell is installed. -Aspell, Ispell or Hunspell are not part of Emacs, but one or the other -is usually installed in GNU/Linux and other free operating systems. +These programs are not part of Emacs, but one of them is usually +installed in GNU/Linux and other free operating systems. @ifnottex @xref{Top, Aspell,, aspell, The Aspell Manual}. @end ifnottex @table @kbd @item M-$ -Check and correct spelling of the active region or the word at point -(@code{ispell-word}). +Check and correct spelling of the word at point (@code{ispell-word}). +If the region is active, do it for all words in the region instead. @item M-x ispell -Check and correct spelling in the active region or the entire buffer. +Check and correct spelling of all words in the buffer. If the region +is active, do it for all words in the region instead. @item M-x ispell-buffer Check and correct spelling in the buffer. @item M-x ispell-region @@ -355,14 +353,13 @@ @end table @findex ispell-complete-word - In Text mode and related modes, the command @kbd{M-@key{TAB}} -(@code{ispell-complete-word}) shows a list of completions based on + In Text mode and related modes, @kbd{M-@key{TAB}} +(@code{ispell-complete-word}) performs in-buffer completion based on spelling correction. Insert the beginning of a word, and then type -@kbd{M-@key{TAB}}; the command displays a completion list window. (If -your window manager intercepts @kbd{M-@key{TAB}}, type @kbd{@key{ESC} -@key{TAB}} or @kbd{C-M-i}.) To choose one of the completions listed, -click @kbd{Mouse-2} or @kbd{Mouse-1} fast on it, or move the cursor -there in the completions window and type @key{RET}. @xref{Text Mode}. +@kbd{M-@key{TAB}}; this shows shows a list of completions. (If your +window manager intercepts @kbd{M-@key{TAB}}, type @kbd{@key{ESC} +@key{TAB}} or @kbd{C-M-i}.) Each completion is listed with a digit or +character; type that digit or character to choose it. @cindex @code{ispell} program @findex ispell-kill-ispell @@ -370,29 +367,27 @@ to run, waiting for something to do, so that subsequent spell checking commands complete more quickly. If you want to get rid of the process, use @kbd{M-x ispell-kill-ispell}. This is not usually -necessary, since the process uses no time except when you do spelling -correction. +necessary, since the process uses no processor time except when you do +spelling correction. @vindex ispell-dictionary @vindex ispell-local-dictionary @vindex ispell-personal-dictionary +@findex ispell-change-dictionary + Ispell, Aspell and Hunspell look up spelling in two dictionaries: +the standard dictionary and your personal dictionary. The standard +dictionary is specified by the variable @code{ispell-local-dictionary} +or, if that is @code{nil}, by the variable @code{ispell-dictionary}. +If both are @code{nil}, the spelling program's default dictionary is +used. The command @kbd{M-x ispell-change-dictionary} sets the +standard dictionary for the buffer and then restarts the subprocess, +so that it will use a different standard dictionary. Your personal +dictionary is specified by the variable +@code{ispell-personal-dictionary}. If that is @code{nil}, the +spelling program looks for a personal dictionary in a default +location. + @vindex ispell-complete-word-dict - Ispell, Aspell and Hunspell use two dictionaries together for spell checking: -the standard dictionary and your private dictionary. The standard -dictionary is specified by @code{ispell-local-dictionary} or, -if @code{nil}, by @code{ispell-dictionary}. If both are @code{nil} -the default dictionary is selected. The command -@kbd{M-x ispell-change-dictionary} sets the standard dictionary for -the buffer and then restarts the subprocess, so that it will use a -different standard dictionary. Personal dictionary is specified by -@code{ispell-personal-dictionary}. If @code{nil}, default value is -used. - - Set variable @code{ispell-dictionary} to select a specific default -dictionary for all your documents. Set variable -@code{ispell-local-dictionary} in the local variables section to -select a specific dictionary for a given document. - A separate dictionary is used for word completion. The variable @code{ispell-complete-word-dict} specifies the file name of this dictionary. The completion dictionary must be different because it @@ -400,16 +395,14 @@ is a spell checking dictionary but no word completion dictionary. @cindex Flyspell mode +@cindex mode, Flyspell @findex flyspell-mode -@findex turn-on-flyspell - Flyspell mode is a fully-automatic way to check spelling as you edit -in Emacs. It operates by checking words as you change or insert them. -When it finds a word that it does not recognize, it highlights that -word. This does not interfere with your editing, but when you see the -highlighted word, you can move to it and fix it. Type @kbd{M-x -flyspell-mode} to enable or disable this mode in the current buffer. -To enable Flyspell mode in all text mode buffers, add -@code{turn-on-flyspell} to @code{text-mode-hook}. + Flyspell mode is a minor mode that performs automatic spell checking +as you type. When it finds a word that it does not recognize, it +highlights that word. Type @kbd{M-x flyspell-mode} to toggle Flyspell +mode in the current buffer. To enable Flyspell mode in all text mode +buffers, add @code{flyspell-mode} to @code{text-mode-hook}. +@xref{Hooks}. When Flyspell mode highlights a word as misspelled, you can click on it with @kbd{Mouse-2} to display a menu of possible corrections and === modified file 'doc/emacs/fortran-xtra.texi' --- doc/emacs/fortran-xtra.texi 2011-07-09 00:51:42 +0000 +++ doc/emacs/fortran-xtra.texi 2011-10-20 00:41:15 +0000 @@ -479,7 +479,7 @@ Otherwise (and by default), the break comes before the delimiter. To enable Auto Fill in all Fortran buffers, add -@code{turn-on-auto-fill} to @code{fortran-mode-hook}. +@code{auto-fill-mode} to @code{fortran-mode-hook}. @iftex @xref{Hooks,,, emacs, the Emacs Manual}. @end iftex === modified file 'doc/emacs/rmail.texi' --- doc/emacs/rmail.texi 2011-10-01 21:54:33 +0000 +++ doc/emacs/rmail.texi 2011-10-20 00:41:15 +0000 @@ -1198,7 +1198,7 @@ @c FIXME goto-addr.el commentary says to use goto-address instead. @smallexample -(add-hook 'rmail-show-message-hook (lambda () (goto-address-mode 1))) +(add-hook 'rmail-show-message-hook 'goto-address-mode) @end smallexample @noindent ------------------------------------------------------------ revno: 106140 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-10-19 20:26:14 -0400 message: Fix more minor mode docstrings. * lisp/emulation/cua-base.el (cua-mode): * lisp/mail/footnote.el (footnote-mode): * lisp/mail/mailabbrev.el (mail-abbrevs-mode): * lisp/net/xesam.el (xesam-minor-mode): * lisp/progmodes/bug-reference.el (bug-reference-mode): * lisp/progmodes/cap-words.el (capitalized-words-mode): * lisp/progmodes/compile.el (compilation-minor-mode) (compilation-shell-minor-mode): * lisp/progmodes/gud.el (gud-tooltip-mode): * lisp/progmodes/hideif.el (hide-ifdef-mode): * lisp/progmodes/idlw-shell.el (idlwave-shell-electric-debug-mode): * lisp/progmodes/subword.el (subword-mode): * lisp/progmodes/vhdl-mode.el (vhdl-electric-mode, vhdl-stutter-mode): * lisp/progmodes/which-func.el (which-function-mode): * lisp/term/tvi970.el (tvi970-set-keypad-mode): * lisp/term/vt100.el (vt100-wide-mode): * lisp/textmodes/flyspell.el (flyspell-mode): * lisp/textmodes/ispell.el (ispell-minor-mode): * lisp/textmodes/nroff-mode.el (nroff-electric-mode): * lisp/textmodes/paragraphs.el (use-hard-newlines): * lisp/textmodes/refill.el (refill-mode): * lisp/textmodes/reftex.el (reftex-mode): * lisp/textmodes/rst.el (rst-minor-mode): * lisp/textmodes/sgml-mode.el (html-autoview-mode) (sgml-electric-tag-pair-mode): * lisp/textmodes/tex-mode.el (latex-electric-env-pair-mode): * lisp/vc/diff-mode.el (diff-auto-refine-mode, diff-minor-mode): * lisp/emulation/crisp.el (crisp-mode): * lisp/emacs-lisp/eldoc.el (eldoc-mode): * lisp/emacs-lisp/checkdoc.el (checkdoc-minor-mode): Doc fixes for new minor mode behavior. * lisp/erc/erc-fill.el (erc-fill-mode): * lisp/erc/erc-track.el (erc-track-minor-mode): Doc fix. * lisp/erc/erc.el (define-erc-module): Fix autogenerated docstring to reflect Emacs 24 minor mode changes. * lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24, calling a minor mode from Lisp with nil arg enables it, so we have to make the working a bit ambiguous here). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-19 22:35:48 +0000 +++ lisp/ChangeLog 2011-10-20 00:26:14 +0000 @@ -1,3 +1,37 @@ +2011-10-20 Chong Yidong + + * emulation/cua-base.el (cua-mode): + * mail/footnote.el (footnote-mode): + * mail/mailabbrev.el (mail-abbrevs-mode): + * net/xesam.el (xesam-minor-mode): + * progmodes/bug-reference.el (bug-reference-mode): + * progmodes/cap-words.el (capitalized-words-mode): + * progmodes/compile.el (compilation-minor-mode) + (compilation-shell-minor-mode): + * progmodes/gud.el (gud-tooltip-mode): + * progmodes/hideif.el (hide-ifdef-mode): + * progmodes/idlw-shell.el (idlwave-shell-electric-debug-mode): + * progmodes/subword.el (subword-mode): + * progmodes/vhdl-mode.el (vhdl-electric-mode, vhdl-stutter-mode): + * progmodes/which-func.el (which-function-mode): + * term/tvi970.el (tvi970-set-keypad-mode): + * term/vt100.el (vt100-wide-mode): + * textmodes/flyspell.el (flyspell-mode): + * textmodes/ispell.el (ispell-minor-mode): + * textmodes/nroff-mode.el (nroff-electric-mode): + * textmodes/paragraphs.el (use-hard-newlines): + * textmodes/refill.el (refill-mode): + * textmodes/reftex.el (reftex-mode): + * textmodes/rst.el (rst-minor-mode): + * textmodes/sgml-mode.el (html-autoview-mode) + (sgml-electric-tag-pair-mode): + * textmodes/tex-mode.el (latex-electric-env-pair-mode): + * vc/diff-mode.el (diff-auto-refine-mode, diff-minor-mode): + * emulation/crisp.el (crisp-mode): + * emacs-lisp/eldoc.el (eldoc-mode): + * emacs-lisp/checkdoc.el (checkdoc-minor-mode): Doc fixes for new + minor mode behavior. + 2011-10-19 Juri Linkov * descr-text.el (describe-char): Add #x2010 and #x2011 to === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2011-08-04 00:58:07 +0000 +++ lisp/cedet/ChangeLog 2011-10-20 00:26:14 +0000 @@ -1,3 +1,9 @@ +2011-10-19 Chong Yidong + + * ede.el (ede-minor-mode,global-ede-mode): + * semantic.el (semantic-mode): Doc fix to reflect new + define-minor-mode calling behavior. + 2011-07-30 Chong Yidong * semantic/grammar.el (semantic-grammar-insert-defanalyzers): Fix === modified file 'lisp/cedet/ede.el' --- lisp/cedet/ede.el 2011-05-10 13:57:12 +0000 +++ lisp/cedet/ede.el 2011-10-20 00:26:14 +0000 @@ -398,8 +398,9 @@ (define-minor-mode ede-minor-mode "Toggle EDE (Emacs Development Environment) minor mode. -With non-nil argument ARG, enable EDE minor mode if ARG is -positive; otherwise, disable it. +With a prefix argument ARG, enable EDE minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +EDE minor mode if ARG is omitted or nil. If this file is contained, or could be contained in an EDE controlled project, then this mode is activated automatically @@ -458,8 +459,9 @@ ;;;###autoload (define-minor-mode global-ede-mode "Toggle global EDE (Emacs Development Environment) mode. -With non-nil argument ARG, enable global EDE mode if ARG is -positive; otherwise, disable it. +With a prefix argument ARG, enable global EDE mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. This global minor mode enables `ede-minor-mode' in all buffers in an EDE controlled project." === modified file 'lisp/cedet/semantic.el' --- lisp/cedet/semantic.el 2011-07-01 00:24:48 +0000 +++ lisp/cedet/semantic.el 2011-10-20 00:26:14 +0000 @@ -1055,8 +1055,10 @@ ;;;###autoload (define-minor-mode semantic-mode - "Toggle Semantic mode. -With ARG, turn Semantic mode on if ARG is positive, off otherwise. + "Toggle parser features (Semantic mode). +With a prefix argument ARG, enable Semantic mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Semantic mode if ARG is omitted or nil. In Semantic mode, Emacs parses the buffers you visit for their semantic content. This information is used by a variety of === modified file 'lisp/emacs-lisp/checkdoc.el' --- lisp/emacs-lisp/checkdoc.el 2011-05-23 17:57:17 +0000 +++ lisp/emacs-lisp/checkdoc.el 2011-10-20 00:26:14 +0000 @@ -1237,9 +1237,10 @@ ;;;###autoload (define-minor-mode checkdoc-minor-mode - "Toggle Checkdoc minor mode, a mode for checking Lisp doc strings. -With prefix ARG, turn Checkdoc minor mode on if ARG is positive, otherwise -turn it off. + "Toggle automatic docstring checking (Checkdoc minor mode). +With a prefix argument ARG, enable Checkdoc minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. In Checkdoc minor mode, the usual bindings for `eval-defun' which is bound to \\\\[checkdoc-eval-defun] and `checkdoc-eval-current-buffer' are overridden to include === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2011-01-25 04:08:28 +0000 +++ lisp/emacs-lisp/eldoc.el 2011-10-20 00:26:14 +0000 @@ -149,14 +149,17 @@ ;;;###autoload (define-minor-mode eldoc-mode - "Toggle ElDoc mode on or off. -In ElDoc mode, the echo area displays information about a -function or variable in the text where point is. If point is -on a documented variable, it displays the first line of that -variable's doc string. Otherwise it displays the argument list -of the function called in the expression point is on. + "Toggle echo area display of Lisp objects at point (ElDoc mode). +With a prefix argument ARG, enable ElDoc mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable ElDoc mode +if ARG is omitted or nil. -With prefix ARG, turn ElDoc mode on if and only if ARG is positive." +ElDoc mode is a buffer-local minor mode. When enabled, the echo +area displays information about a function or variable in the +text where point is. If point is on a documented variable, it +displays the first line of that variable's doc string. Otherwise +it displays the argument list of the function called in the +expression point is on." :group 'eldoc :lighter eldoc-minor-mode-string (setq eldoc-last-message nil) (if eldoc-mode === modified file 'lisp/emulation/crisp.el' --- lisp/emulation/crisp.el 2011-01-25 04:08:28 +0000 +++ lisp/emulation/crisp.el 2011-10-20 00:26:14 +0000 @@ -349,8 +349,10 @@ ;;;###autoload (define-minor-mode crisp-mode - "Toggle CRiSP/Brief emulation minor mode. -With ARG, turn CRiSP mode on if ARG is positive, off otherwise." + "Toggle CRiSP/Brief emulation (CRiSP mode). +With a prefix argument ARG, enable CRiSP mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil." :keymap crisp-mode-map :lighter crisp-mode-modeline-string (when crisp-mode === modified file 'lisp/emulation/cua-base.el' --- lisp/emulation/cua-base.el 2011-04-25 18:17:17 +0000 +++ lisp/emulation/cua-base.el 2011-10-20 00:26:14 +0000 @@ -1531,16 +1531,17 @@ ;;;###autoload (define-minor-mode cua-mode - "Toggle CUA key-binding mode. -When enabled, using shifted movement keys will activate the -region (and highlight the region using `transient-mark-mode'), -and typed text replaces the active selection. + "Toggle Common User Access style editing (CUA mode). +With a prefix argument ARG, enable CUA mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. -Also when enabled, you can use C-z, C-x, C-c, and C-v to undo, -cut, copy, and paste in addition to the normal Emacs bindings. -The C-x and C-c keys only do cut and copy when the region is -active, so in most cases, they do not conflict with the normal -function of these prefix keys. +CUA mode is a global minor mode. When enabled, typed text +replaces the active selection, and you can use C-z, C-x, C-c, and +C-v to undo, cut, copy, and paste in addition to the normal Emacs +bindings. The C-x and C-c keys only do cut and copy when the +region is active, so in most cases, they do not conflict with the +normal function of these prefix keys. If you really need to perform a command which starts with one of the prefix keys even when the region is active, you have three === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2011-09-23 21:22:31 +0000 +++ lisp/erc/ChangeLog 2011-10-20 00:26:14 +0000 @@ -1,3 +1,11 @@ +2011-10-20 Chong Yidong + + * erc.el (define-erc-module): Fix autogenerated docstring to + reflect Emacs 24 minor mode changes. + + * erc-fill.el (erc-fill-mode): + * erc-track.el (erc-track-minor-mode): Doc fix. + 2011-09-23 Antoine Levitt * erc-button.el (erc-button-next-function): Scoping fix === modified file 'lisp/erc/erc-fill.el' --- lisp/erc/erc-fill.el 2011-01-25 04:08:28 +0000 +++ lisp/erc/erc-fill.el 2011-10-20 00:26:14 +0000 @@ -39,9 +39,12 @@ ;;;###autoload (autoload 'erc-fill-mode "erc-fill" nil t) (erc-define-minor-mode erc-fill-mode "Toggle ERC fill mode. -With numeric arg, turn ERC fill mode on if and only if arg is -positive. In ERC fill mode, messages in the channel buffers are -filled." +With a prefix argument ARG, enable ERC fill mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +ERC fill mode is a global minor mode. When enabled, messages in +the channel buffers are filled." nil nil nil :global t :group 'erc-fill (if erc-fill-mode === modified file 'lisp/erc/erc-track.el' --- lisp/erc/erc-track.el 2011-03-04 05:04:51 +0000 +++ lisp/erc/erc-track.el 2011-10-20 00:26:14 +0000 @@ -588,12 +588,15 @@ ;;;###autoload (define-minor-mode erc-track-minor-mode - "Global minor mode for tracking ERC buffers and showing activity in the -mode line. + "Toggle mode line display of ERC activity (ERC Track minor mode). +With a prefix argument ARG, enable ERC Track minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -This exists for the sole purpose of providing the C-c C-SPC and -C-c C-@ keybindings. Make sure that you have enabled the track -module, otherwise the keybindings will not do anything useful." +ERC Track minor mode is a global minor mode. It exists for the +sole purpose of providing the C-c C-SPC and C-c C-@ keybindings. +Make sure that you have enabled the track module, otherwise the +keybindings will not do anything useful." :init-value nil :lighter "" :keymap erc-track-minor-mode-map === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2011-07-04 13:23:04 +0000 +++ lisp/erc/erc.el 2011-10-20 00:26:14 +0000 @@ -1242,7 +1242,9 @@ (erc-define-minor-mode ,mode ,(format "Toggle ERC %S mode. -With arg, turn ERC %S mode on if and only if arg is positive. +With a prefix argument ARG, enable %s if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. %s" name name doc) nil nil nil :global ,(not local-p) :group (quote ,group) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-18 14:10:52 +0000 +++ lisp/gnus/ChangeLog 2011-10-20 00:26:14 +0000 @@ -1,3 +1,9 @@ +2011-10-20 Chong Yidong + + * gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24, + calling a minor mode from Lisp with nil arg enables it, so we have to + make the working a bit ambiguous here). + 2011-10-18 Teodor Zlatanov * gnus-util.el (gnus-bound-and-true-p): Macro for XEmacs compatibility. === modified file 'lisp/gnus/gnus-cite.el' --- lisp/gnus/gnus-cite.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-cite.el 2011-10-20 00:26:14 +0000 @@ -1224,13 +1224,8 @@ (autoload 'font-lock-set-defaults "font-lock"))) (define-minor-mode gnus-message-citation-mode - "Toggle `gnus-message-citation-mode' in current buffer. -This buffer local minor mode provides additional font-lock support for -nested citations. -With prefix ARG, turn `gnus-message-citation-mode' on if and only if ARG -is positive. -Automatically turn `font-lock-mode' on when `gnus-message-citation-mode' -is turned on." + "Minor mode providing more font-lock support for nested citations. +When enabled, it automatically turns on `font-lock-mode'." nil ;; init-value "" ;; lighter nil ;; keymap === modified file 'lisp/mail/footnote.el' --- lisp/mail/footnote.el 2011-05-10 08:20:21 +0000 +++ lisp/mail/footnote.el 2011-10-20 00:26:14 +0000 @@ -788,9 +788,14 @@ ;;;###autoload (define-minor-mode footnote-mode - "Toggle footnote minor mode. -This minor mode provides footnote support for `message-mode'. To get -started, play around with the following keys: + "Toggle Footnote mode. +With a prefix argument ARG, enable Footnote mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Footnode mode is a buffer-local minor mode. If enabled, it +provides footnote support for `message-mode'. To get started, +play around with the following keys: \\{footnote-minor-mode-map}" :lighter footnote-mode-line-string :keymap footnote-minor-mode-map === modified file 'lisp/mail/mailabbrev.el' --- lisp/mail/mailabbrev.el 2011-06-20 16:02:31 +0000 +++ lisp/mail/mailabbrev.el 2011-10-20 00:26:14 +0000 @@ -133,7 +133,15 @@ ;;;###autoload (define-minor-mode mail-abbrevs-mode - "Non-nil means expand mail aliases as abbrevs, in certain message headers." + "Toggle abbrev expansion of mail aliases (Mail Abbrevs mode). +With a prefix argument ARG, enable Mail Abbrevs mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Mail Abbrevs mode is a global minor mode. When enabled, +abbrev-like expansion is performed when editing certain mail +headers (those specified by `mail-abbrev-mode-regexp'), based on +the entries in your `mail-personal-alias-file'." :global t :group 'mail-abbrev :version "20.3" === modified file 'lisp/net/goto-addr.el' --- lisp/net/goto-addr.el 2011-01-25 04:08:28 +0000 +++ lisp/net/goto-addr.el 2011-10-20 00:26:14 +0000 @@ -288,7 +288,7 @@ ;;;###autoload (define-minor-mode goto-address-prog-mode - "Turn on `goto-address-mode', but only in comments and strings." + "Like `goto-address-mode', but only for comments and strings." nil "" nil === modified file 'lisp/net/xesam.el' --- lisp/net/xesam.el 2011-03-15 17:39:56 +0000 +++ lisp/net/xesam.el 2011-10-20 00:26:14 +0000 @@ -516,9 +516,9 @@ (define-minor-mode xesam-minor-mode "Toggle Xesam minor mode. -With no argument, this command toggles the mode. -Non-null prefix argument turns on the mode. -Null prefix argument turns off the mode. +With a prefix argument ARG, enable Xesam minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. When Xesam minor mode is enabled, all text which matches a previous Xesam query in this buffer is highlighted." === modified file 'lisp/progmodes/bug-reference.el' --- lisp/progmodes/bug-reference.el 2011-04-22 18:44:26 +0000 +++ lisp/progmodes/bug-reference.el 2011-10-20 00:26:14 +0000 @@ -127,7 +127,10 @@ ;;;###autoload (define-minor-mode bug-reference-mode - "Minor mode to buttonize bugzilla references in the current buffer." + "Toggle hyperlinking bug references in the buffer (Bug Reference mode). +With a prefix argument ARG, enable Bug Reference mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." nil "" nil === modified file 'lisp/progmodes/cap-words.el' --- lisp/progmodes/cap-words.el 2011-01-26 08:36:39 +0000 +++ lisp/progmodes/cap-words.el 2011-10-20 00:26:14 +0000 @@ -60,9 +60,13 @@ ;;;###autoload (define-minor-mode capitalized-words-mode "Toggle Capitalized Words mode. +With a prefix argument ARG, enable Capitalized Words mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -In this minor mode, a word boundary occurs immediately before an -uppercase letter in a symbol. This is in addition to all the normal +Capitalized Words mode is a buffer-local minor mode. When +enabled, a word boundary occurs immediately before an uppercase +letter in a symbol. This is in addition to all the normal boundaries given by the syntax and category tables. There is no restriction to ASCII. === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2011-09-10 21:15:28 +0000 +++ lisp/progmodes/compile.el 2011-10-20 00:26:14 +0000 @@ -1968,12 +1968,15 @@ ;;;###autoload (define-minor-mode compilation-shell-minor-mode - "Toggle compilation shell minor mode. -With arg, turn compilation mode on if and only if arg is positive. -In this minor mode, all the error-parsing commands of the -Compilation major mode are available but bound to keys that don't -collide with Shell mode. See `compilation-mode'. -Turning the mode on runs the normal hook `compilation-shell-minor-mode-hook'." + "Toggle Compilation Shell minor mode. +With a prefix argument ARG, enable Compilation Shell minor mode +if ARG is positive, and disable it otherwise. If called from +Lisp, enable the mode if ARG is omitted or nil. + +When Compilation Shell minor mode is enabled, all the +error-parsing commands of the Compilation major mode are +available but bound to keys that don't collide with Shell mode. +See `compilation-mode'." nil " Shell-Compile" :group 'compilation (if compilation-shell-minor-mode @@ -1982,11 +1985,14 @@ ;;;###autoload (define-minor-mode compilation-minor-mode - "Toggle compilation minor mode. -With arg, turn compilation mode on if and only if arg is positive. -In this minor mode, all the error-parsing commands of the -Compilation major mode are available. See `compilation-mode'. -Turning the mode on runs the normal hook `compilation-minor-mode-hook'." + "Toggle Compilation minor mode. +With a prefix argument ARG, enable Compilation minor mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +When Compilation minor mode is enabled, all the error-parsing +commands of Compilation major mode are available. See +`compilation-mode'." nil " Compilation" :group 'compilation (if compilation-minor-mode === modified file 'lisp/progmodes/gud.el' --- lisp/progmodes/gud.el 2011-09-11 18:30:07 +0000 +++ lisp/progmodes/gud.el 2011-10-20 00:26:14 +0000 @@ -3255,7 +3255,10 @@ ;;;###autoload (define-minor-mode gud-tooltip-mode - "Toggle the display of GUD tooltips." + "Toggle the display of GUD tooltips. +With a prefix argument ARG, enable the feature if ARG is +positive, and disable it otherwise. If called from Lisp, enable +it if ARG is omitted or nil." :global t :group 'gud :group 'tooltip === modified file 'lisp/progmodes/hideif.el' --- lisp/progmodes/hideif.el 2011-04-22 18:44:26 +0000 +++ lisp/progmodes/hideif.el 2011-10-20 00:26:14 +0000 @@ -214,11 +214,15 @@ ;;;###autoload (define-minor-mode hide-ifdef-mode - "Toggle Hide-Ifdef mode. This is a minor mode, albeit a large one. -With ARG, turn Hide-Ifdef mode on if arg is positive, off otherwise. -In Hide-Ifdef mode, code within #ifdef constructs that the C preprocessor -would eliminate may be hidden from view. Several variables affect -how the hiding is done: + "Toggle features to hide/show #ifdef blocks (Hide-Ifdef mode). +With a prefix argument ARG, enable Hide-Ifdef mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Hide-Ifdef mode is a buffer-local minor mode for use with C and +C-like major modes. When enabled, code within #ifdef constructs +that the C preprocessor would eliminate may be hidden from view. +Several variables affect how the hiding is done: `hide-ifdef-env' An association list of defined and undefined symbols for the === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2011-05-23 17:57:17 +0000 +++ lisp/progmodes/idlw-shell.el 2011-10-20 00:26:14 +0000 @@ -4277,16 +4277,14 @@ (defvar idlwave-shell-electric-debug-buffers nil) (define-minor-mode idlwave-shell-electric-debug-mode - "Toggle Electric Debug mode. -With no argument, this command toggles the mode. -Non-null prefix argument turns on the mode. -Null prefix argument turns off the mode. + "Toggle Idlwave Shell Electric Debug mode. +With a prefix argument ARG, enable the mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. -When Electric Debug mode is enabled, the many debugging commands are -available as single key sequences." -nil -" *Debugging*" -idlwave-shell-electric-debug-mode-map) +When Idlwave Shell Electric Debug mode is enabled, the Idlwave +Shell debugging commands are available as single key sequences." + nil " *Debugging*" idlwave-shell-electric-debug-mode-map) (add-hook 'idlwave-shell-electric-debug-mode-on-hook === modified file 'lisp/progmodes/subword.el' --- lisp/progmodes/subword.el 2011-01-25 04:08:28 +0000 +++ lisp/progmodes/subword.el 2011-10-20 00:26:14 +0000 @@ -94,13 +94,19 @@ ;;;###autoload (define-minor-mode subword-mode - "Mode enabling subword movement and editing keys. -In spite of GNU Coding Standards, it is popular to name a symbol by -mixing uppercase and lowercase letters, e.g. \"GtkWidget\", -\"EmacsFrameClass\", \"NSGraphicsContext\", etc. Here we call these -mixed case symbols `nomenclatures'. Also, each capitalized (or -completely uppercase) part of a nomenclature is called a `subword'. -Here are some examples: + "Toggle subword movement and editing (Subword mode). +With a prefix argument ARG, enable Subword mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Subword mode is a buffer-local minor mode. Enabling it remaps +word-based editing commands to subword-based commands that handle +symbols with mixed uppercase and lowercase letters, +e.g. \"GtkWidget\", \"EmacsFrameClass\", \"NSGraphicsContext\". + +Here we call these mixed case symbols `nomenclatures'. Each +capitalized (or completely uppercase) part of a nomenclature is +called a `subword'. Here are some examples: Nomenclature Subwords =========================================================== === modified file 'lisp/progmodes/vhdl-mode.el' --- lisp/progmodes/vhdl-mode.el 2011-05-10 13:57:12 +0000 +++ lisp/progmodes/vhdl-mode.el 2011-10-20 00:26:14 +0000 @@ -8029,12 +8029,16 @@ (define-minor-mode vhdl-electric-mode "Toggle VHDL electric mode. -Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil." +With a prefix argument ARG, enable the mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable it if ARG +is omitted or nil." :global t) (define-minor-mode vhdl-stutter-mode "Toggle VHDL stuttering mode. -Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil." +With a prefix argument ARG, enable the mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable it if ARG +is omitted or nil." :global t) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; === modified file 'lisp/progmodes/which-func.el' --- lisp/progmodes/which-func.el 2011-07-05 18:56:31 +0000 +++ lisp/progmodes/which-func.el 2011-10-20 00:26:14 +0000 @@ -236,12 +236,14 @@ ;; This is the name people would normally expect. ;;;###autoload (define-minor-mode which-function-mode - "Toggle Which Function mode, globally. -When Which Function mode is enabled, the current function name is -continuously displayed in the mode line, in certain major modes. + "Toggle mode line display of current function (Which Function mode). +With a prefix argument ARG, enable Which Function mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -With prefix ARG, turn Which Function mode on if arg is positive, -and off otherwise." +Which Function mode is a global minor mode. When enabled, the +current function name is continuously displayed in the mode line, +in certain major modes." :global t :group 'which-func (when (timerp which-func-update-timer) (cancel-timer which-func-update-timer)) === modified file 'lisp/term/tvi970.el' --- lisp/term/tvi970.el 2011-01-25 04:08:28 +0000 +++ lisp/term/tvi970.el 2011-10-20 00:26:14 +0000 @@ -104,14 +104,17 @@ ;; Should keypad numbers send ordinary digits or distinct escape sequences? (define-minor-mode tvi970-set-keypad-mode - "Set the current mode of the TVI 970 numeric keypad. -In ``numeric keypad mode'', the number keys on the keypad act as -ordinary digits. In ``alternate keypad mode'', the keys send distinct -escape sequences, meaning that they can have their own bindings, + "Toggle alternate keypad mode on TVI 970 keypad. +With a prefix argument ARG, enable the mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. + +In ``alternate keypad mode'', the keys send distinct escape +sequences, meaning that they can have their own bindings, independent of the normal number keys. -With no argument, toggle between the two possible modes. -With a positive argument, select alternate keypad mode. -With a negative argument, select numeric keypad mode." + +When disabled, the terminal enters ``numeric keypad mode'', in +which the keypad's keys act as ordinary digits." :variable (terminal-parameter nil 'tvi970-keypad-numeric) (send-string-to-terminal (if (terminal-parameter nil 'tvi970-keypad-numeric) "\e=" "\e>"))) === modified file 'lisp/term/vt100.el' --- lisp/term/vt100.el 2011-01-25 04:08:28 +0000 +++ lisp/term/vt100.el 2011-10-20 00:26:14 +0000 @@ -42,8 +42,9 @@ ;;; Controlling the screen width. (define-minor-mode vt100-wide-mode "Toggle 132/80 column mode for vt100s. -With positive argument, switch to 132-column mode. -With negative argument, switch to 80-column mode." +With a prefix argument ARG, switch to 132-column mode if ARG is +positive, and 80-column mode otherwise. If called from Lisp, +switch to 132-column mode if ARG is omitted or nil." :global t :init-value (= (frame-width) 132) (send-string-to-terminal (if vt100-wide-mode "\e[?3h" "\e[?3l")) (set-frame-width terminal-frame (if vt100-wide-mode 132 80))) === modified file 'lisp/textmodes/flyspell.el' --- lisp/textmodes/flyspell.el 2011-10-13 18:37:57 +0000 +++ lisp/textmodes/flyspell.el 2011-10-20 00:26:14 +0000 @@ -469,12 +469,14 @@ ;;;###autoload(defvar flyspell-mode nil) ;;;###autoload (define-minor-mode flyspell-mode - "Minor mode performing on-the-fly spelling checking. -This spawns a single Ispell process and checks each word. -The default flyspell behavior is to highlight incorrect words. -With no argument, this command toggles Flyspell mode. -With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive, -otherwise turn it off. + "Toggle on-the-fly spell checking (Flyspell mode). +With a prefix argument ARG, enable Flyspell mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Flyspell mode is a buffer-local minor mode. When enabled, it +spawns a single Ispell process and checks each word. The default +flyspell behavior is to highlight incorrect words. Bindings: \\[ispell-word]: correct words (using Ispell). === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2011-09-17 12:07:50 +0000 +++ lisp/textmodes/ispell.el 2011-10-20 00:26:14 +0000 @@ -3462,15 +3462,21 @@ ;;;###autoload (define-minor-mode ispell-minor-mode - "Toggle Ispell minor mode. -With prefix argument ARG, turn Ispell minor mode on if ARG is positive, -otherwise turn it off. - -In Ispell minor mode, pressing SPC or RET -warns you if the previous word is incorrectly spelled. - -All the buffer-local variables and dictionaries are ignored -- to read -them into the running ispell process, type \\[ispell-word] SPC." + "Toggle last-word spell checking (Ispell minor mode). +With a prefix argument ARG, enable Ispell minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Ispell minor mode is a buffer-local mior mode. When enabled, +typing SPC or RET warns you if the previous word is incorrectly +spelled. + +All the buffer-local variables and dictionaries are ignored. To +read them into the running ispell process, type \\[ispell-word] +SPC. + +For spell-checking \"on the fly\", not just after typing SPC or +RET, use `flyspell-mode'." nil " Spell" ispell-minor-keymap) (defun ispell-minor-check () === modified file 'lisp/textmodes/nroff-mode.el' --- lisp/textmodes/nroff-mode.el 2011-01-26 08:36:39 +0000 +++ lisp/textmodes/nroff-mode.el 2011-10-20 00:26:14 +0000 @@ -297,11 +297,17 @@ (forward-char 1)))) (define-minor-mode nroff-electric-mode - "Toggle `nroff-electric-newline' minor mode. -`nroff-electric-newline' forces Emacs to check for an nroff request at the -beginning of the line, and insert the matching closing request if necessary. -This command toggles that mode (off->on, on->off), with an argument, -turns it on if arg is positive, otherwise off." + "Toggle automatic nroff request pairing (Nroff Electric mode). +With a prefix argument ARG, enable Nroff Electric mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Nroff Electric mode is a buffer-local minor mode, for use with +`nroff-mode'. When enabled, Emacs checks for an nroff request at +the beginning of the line, and inserts the matching closing +request if necessary. This command toggles that mode (off->on, +on->off), with an argument, turns it on if arg is positive, +otherwise off." :lighter " Electric" (or (derived-mode-p 'nroff-mode) (error "Must be in nroff mode"))) === modified file 'lisp/textmodes/paragraphs.el' --- lisp/textmodes/paragraphs.el 2011-09-23 23:55:52 +0000 +++ lisp/textmodes/paragraphs.el 2011-10-20 00:26:14 +0000 @@ -35,19 +35,23 @@ (put 'use-hard-newlines 'permanent-local t) (define-minor-mode use-hard-newlines - "Minor mode to distinguish hard and soft newlines. -When active, the functions `newline' and `open-line' add the + "Toggle distinguishing between hard and soft newlines. +With a prefix argument ARG, enable the feature if ARG is +positive, and disable it otherwise. If called from Lisp, enable +it if ARG is omitted or nil. + +When enabled, the functions `newline' and `open-line' add the text-property `hard' to newlines that they insert, and a line is only considered as a candidate to match `paragraph-start' or `paragraph-separate' if it follows a hard newline. -Prefix argument says to turn mode on if positive, off if negative. -When the mode is turned on, if there are newlines in the buffer but no hard -newlines, ask the user whether to mark as hard any newlines preceding a -`paragraph-start' line. From a program, second arg INSERT specifies whether -to do this; it can be `never' to change nothing, t or `always' to force -marking, `guess' to try to do the right thing with no questions, nil -or anything else to ask the user. +When enabling, if there are newlines in the buffer but no hard +newlines, ask the user whether to mark as hard any newlines +preceding a `paragraph-start' line. From a program, second arg +INSERT specifies whether to do this; it can be `never' to change +nothing, t or `always' to force marking, `guess' to try to do the +right thing with no questions, nil or anything else to ask the +user. Newlines not marked hard are called \"soft\", and are always internal to paragraphs. The fill functions insert and delete only soft newlines." === modified file 'lisp/textmodes/refill.el' --- lisp/textmodes/refill.el 2011-01-25 04:08:28 +0000 +++ lisp/textmodes/refill.el 2011-10-20 00:26:14 +0000 @@ -213,12 +213,17 @@ ;;;###autoload (define-minor-mode refill-mode - "Toggle Refill minor mode. -With prefix arg, turn Refill mode on if arg is positive, otherwise turn it off. - -When Refill mode is on, the current paragraph will be formatted when -changes are made within it. Self-inserting characters only cause -refilling if they would cause auto-filling." + "Toggle automatic refilling (Refill mode). +With a prefix argument ARG, enable Refill mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Refill mode is a buffer-local minor mode. When enabled, the +current paragraph is refilled as you edit. Self-inserting +characters only cause refilling if they would cause +auto-filling. + +For true \"word wrap\" behavior, use `visual-line-mode' instead." :group 'refill :lighter " Refill" :keymap '(("\177" . backward-delete-char-untabify)) === modified file 'lisp/textmodes/reftex.el' --- lisp/textmodes/reftex.el 2011-03-06 00:30:16 +0000 +++ lisp/textmodes/reftex.el 2011-10-20 00:26:14 +0000 @@ -503,7 +503,13 @@ (put 'reftex-mode :menu-tag "RefTeX Mode") ;;;###autoload (define-minor-mode reftex-mode - "Minor mode with distinct support for \\label, \\ref and \\cite in LaTeX. + "Toggle RefTeX mode. +With a prefix argument ARG, enable RefTeX mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +RefTeX mode is a buffer-local minor mode with distinct support +for \\label, \\ref and \\cite in LaTeX. \\A Table of Contents of the entire (multifile) document with browsing capabilities is available with `\\[reftex-toc]'. === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2011-07-05 10:02:48 +0000 +++ lisp/textmodes/rst.el 2011-10-20 00:26:14 +0000 @@ -442,11 +442,10 @@ ;;;###autoload (define-minor-mode rst-minor-mode - "ReST Minor Mode. -Toggle ReST minor mode. -With no argument, this command toggles the mode. -Non-null prefix argument turns on the mode. -Null prefix argument turns off the mode. + "Toggle ReST minor mode. +With a prefix argument ARG, enable ReST minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. When ReST minor mode is enabled, the ReST mode keybindings are installed on top of the major mode bindings. Use this === modified file 'lisp/textmodes/sgml-mode.el' --- lisp/textmodes/sgml-mode.el 2011-03-06 02:30:44 +0000 +++ lisp/textmodes/sgml-mode.el 2011-10-20 00:26:14 +0000 @@ -841,7 +841,14 @@ (delete-overlay (pop sgml-electric-tag-pair-overlays)))) (define-minor-mode sgml-electric-tag-pair-mode - "Automatically update the closing tag when editing the opening one." + "Toggle SGML Electric Tag Pair mode. +With a prefix argument ARG, enable the mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. + +SGML Electric Tag Pair mode is a buffer-local minor mode for use +with `sgml-mode' and related maor modes. When enabled, editing +an opening markup tag automatically updates the closing tag." :lighter "/e" (if sgml-electric-tag-pair-mode (progn @@ -2024,9 +2031,14 @@ (nreverse toc-index))) (define-minor-mode html-autoview-mode - "Toggle automatic viewing via `browse-url-of-buffer' upon saving buffer. -With positive prefix ARG always turns viewing on, with negative ARG always off. -Can be used as a value for `html-mode-hook'." + "Toggle viewing of HTML files on save (HTML Autoview mode). +With a prefix argument ARG, enable HTML Autoview mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +HTML Autoview mode is a buffer-local minor mode for use with +`html-mode'. If enabled, saving the file automatically runs +`browse-url-of-buffer' to view it." nil nil nil :group 'sgml (if html-autoview-mode === modified file 'lisp/textmodes/tex-mode.el' --- lisp/textmodes/tex-mode.el 2011-01-28 21:16:04 +0000 +++ lisp/textmodes/tex-mode.el 2011-10-20 00:26:14 +0000 @@ -677,8 +677,14 @@ (put-text-property start end 'latex-env-pair t))) (define-minor-mode latex-electric-env-pair-mode - "Automatically update the \\end arg when editing the \\begin one. -And vice-versa." + "Toggle Latex Electric Env Pair mode. +With a prefix argument ARG, enable the mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable it if ARG +is omitted or nil. + +Latex Electric Env Pair mode is a buffer-local minor mode for use +with `latex-mode'. When enabled, typing a \\begin or \\end tag +automatically inserts its partner." :lighter "/e" (if latex-electric-env-pair-mode (add-hook 'before-change-functions === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2011-09-24 22:58:40 +0000 +++ lisp/url/ChangeLog 2011-10-20 00:26:14 +0000 @@ -1,3 +1,7 @@ +2011-10-19 Chong Yidong + + * url-handlers.el (url-handler-mode): Doc fix. + 2011-09-24 Christopher J. White (tiny change) * url-http.el (url-http-create-request): Avoid adding extra CRLF === modified file 'lisp/url/url-handlers.el' --- lisp/url/url-handlers.el 2011-01-25 04:08:28 +0000 +++ lisp/url/url-handlers.el 2011-10-20 00:26:14 +0000 @@ -100,7 +100,10 @@ ;;;###autoload (define-minor-mode url-handler-mode - "Use URL to handle URL-like file names." + "Toggle using `url' library for URL filenames (URL Handler mode). +With a prefix argument ARG, enable URL Handler mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :global t :group 'url (if (not (boundp 'file-name-handler-alist)) ;; Can't be turned ON anyway. === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2011-05-22 19:22:37 +0000 +++ lisp/vc/diff-mode.el 2011-10-20 00:26:14 +0000 @@ -225,9 +225,16 @@ "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.") (define-minor-mode diff-auto-refine-mode - "Automatically highlight changes in detail as the user visits hunks. -When transitioning from disabled to enabled, -try to refine the current hunk, as well." + "Toggle automatic diff hunk highlighting (Diff Auto Refine mode). +With a prefix argument ARG, enable Diff Auto Refine mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +Diff Auto Refine mode is a buffer-local minor mode used with +`diff-mode'. When enabled, Emacs automatically highlights +changes in detail as the user visits hunks. When transitioning +from disabled to enabled, it tries to refine the current hunk, as +well." :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine" (when diff-auto-refine-mode (condition-case-no-debug nil (diff-refine-hunk) (error nil)))) @@ -1306,7 +1313,11 @@ ;;;###autoload (define-minor-mode diff-minor-mode - "Minor mode for viewing/editing context diffs. + "Toggle Diff minor mode. +With a prefix argument ARG, enable Diff minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + \\{diff-minor-mode-map}" :group 'diff-mode :lighter " Diff" ;; FIXME: setup font-lock ------------------------------------------------------------ revno: 106139 committer: Juri Linkov branch nick: trunk timestamp: Thu 2011-10-20 01:35:48 +0300 message: * lisp/descr-text.el (describe-char): Add #x2010 and #x2011 to the list of hard-coded chars with escape-glyph face. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-19 21:43:41 +0000 +++ lisp/ChangeLog 2011-10-19 22:35:48 +0000 @@ -1,3 +1,8 @@ +2011-10-19 Juri Linkov + + * descr-text.el (describe-char): Add #x2010 and #x2011 to + the list of hard-coded chars with escape-glyph face. + 2011-10-19 Stefan Monnier * vc/log-edit.el (log-edit-empty-buffer-p): Ignore empty headers. === modified file 'lisp/descr-text.el' --- lisp/descr-text.el 2011-09-29 00:12:44 +0000 +++ lisp/descr-text.el 2011-10-19 22:35:48 +0000 @@ -606,7 +606,8 @@ 'trailing-whitespace) ((and nobreak-char-display char (eq char '#xa0)) 'nobreak-space) - ((and nobreak-char-display char (eq char '#xad)) + ((and nobreak-char-display char + (memq char '(#xad #x2010 #x2011))) 'escape-glyph) ((and (< char 32) (not (memq char '(9 10)))) 'escape-glyph))))) ------------------------------------------------------------ revno: 106138 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-10-19 17:43:41 -0400 message: * vc/log-edit.el (log-edit-empty-buffer-p): Ignore empty headers. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-19 20:21:35 +0000 +++ lisp/ChangeLog 2011-10-19 21:43:41 +0000 @@ -1,3 +1,7 @@ +2011-10-19 Stefan Monnier + + * vc/log-edit.el (log-edit-empty-buffer-p): Ignore empty headers. + 2011-10-19 Michael Albinus * net/tramp.el (tramp-connectable-p): Make a stronger check on a === modified file 'lisp/vc/log-edit.el' --- lisp/vc/log-edit.el 2011-10-18 13:38:09 +0000 +++ lisp/vc/log-edit.el 2011-10-19 21:43:41 +0000 @@ -536,7 +536,7 @@ (or (= (point-min) (point-max)) (save-excursion (goto-char (point-min)) - (while (and (looking-at "^\\(Summary: \\)?$") + (while (and (looking-at "^\\([a-zA-Z]+: \\)?$") (zerop (forward-line 1)))) (eobp)))) ------------------------------------------------------------ revno: 106137 committer: Michael Albinus branch nick: trunk timestamp: Wed 2011-10-19 22:21:35 +0200 message: * net/tramp.el (tramp-connectable-p): Make a stronger check on a running process. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-19 16:42:20 +0000 +++ lisp/ChangeLog 2011-10-19 20:21:35 +0000 @@ -1,3 +1,8 @@ +2011-10-19 Michael Albinus + + * net/tramp.el (tramp-connectable-p): Make a stronger check on a + running process. + 2011-10-19 Glenn Morris * vc/vc-bzr.el (vc-bzr-after-dir-status): === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2011-10-18 09:58:06 +0000 +++ lisp/net/tramp.el 2011-10-19 20:21:35 +0000 @@ -2103,8 +2103,9 @@ not in completion mode." (and (tramp-tramp-file-p filename) (with-parsed-tramp-file-name filename nil - (or (get-buffer (tramp-buffer-name v)) - (not (tramp-completion-mode-p)))))) + (or (not (tramp-completion-mode-p)) + (let ((p (tramp-get-connection-process v))) + (and p (processp p) (memq (process-status p) '(run open)))))))) ;; Method, host name and user name completion. ;; `tramp-completion-dissect-file-name' returns a list of ------------------------------------------------------------ revno: 106136 fixes bug(s): http://debbugs.gnu.org/9726 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-19 09:42:20 -0700 message: * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Ignore ignored files. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-19 12:54:24 +0000 +++ lisp/ChangeLog 2011-10-19 16:42:20 +0000 @@ -1,3 +1,8 @@ +2011-10-19 Glenn Morris + + * vc/vc-bzr.el (vc-bzr-after-dir-status): + Ignore ignored files. (Bug#9726) + 2011-10-19 Chong Yidong Doc fix for minor modes, stating that an omitted argument enables === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2011-09-18 20:43:20 +0000 +++ lisp/vc/vc-bzr.el 2011-10-19 16:42:20 +0000 @@ -866,7 +866,7 @@ (" M " . edited) ;; file text modified (" *" . edited) ;; execute bit changed (" M*" . edited) ;; text modified + execute bit changed - ;; FIXME: what about ignored files? + ("I " . ignored) (" D " . missing) ;; For conflicts, should we list the .THIS/.BASE/.OTHER? ("C " . conflict) @@ -916,7 +916,7 @@ (push (list new-name 'edited (vc-bzr-create-extra-fileinfo old-name)) result))) ;; do nothing for non existent files - ((eq translated 'not-found)) + ((memq translated '(not-found ignored))) (t (push (list (file-relative-name (buffer-substring-no-properties ------------------------------------------------------------ revno: 106135 committer: Jan D. branch nick: trunk timestamp: Wed 2011-10-19 17:42:29 +0200 message: * INSTALL: Remove XCode part. diff: === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2011-10-18 05:47:56 +0000 +++ nextstep/ChangeLog 2011-10-19 15:42:29 +0000 @@ -1,3 +1,7 @@ +2011-10-19 Jan Djärv + + * INSTALL: Remove XCode part. + 2011-10-18 Jan Djärv * Cocoa/Emacs.xcodeproj: === modified file 'nextstep/INSTALL' --- nextstep/INSTALL 2011-01-25 04:08:28 +0000 +++ nextstep/INSTALL 2011-10-19 15:42:29 +0000 @@ -30,27 +30,6 @@ Move nextstep/Emacs.app to any desired install location. -Xcode ------ - -On OS X Emacs can be built under Xcode. You need to run "configure" -as described above first. There are two targets: 'temacs' and 'Emacs.app'. - -'temacs' will build the undumped emacs executable, and copy it and the -*.o files to the src directory. These steps are necessary so the next target -works. - -'Emacs.app' uses "Run Script" build phases to assemble the Emacs.app bundle. -It uses the 'ns-app' target in src/Makefile together with the 'install' target -in the top level Makefile. - -The source files under the temacs target must list "pre-crt0" first -and "lastfile" last, so that dumping works. - -(Note, under GNUstep, you CAN'T use ProjectCenter, since PC cannot work -with files outside of its project directory.) - - Distributions and Universal Binaries ------------------------------------ ------------------------------------------------------------ revno: 106134 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-10-19 08:54:24 -0400 message: Fix minor mode docstrings for the new meaning of a nil ARG. * abbrev.el (abbrev-mode): * allout.el (allout-mode): * autoinsert.el (auto-insert-mode): * autoarg.el (autoarg-mode, autoarg-kp-mode): * autorevert.el (auto-revert-mode, auto-revert-tail-mode) (global-auto-revert-mode): * battery.el (display-battery-mode): * composite.el (global-auto-composition-mode) (auto-composition-mode): * delsel.el (delete-selection-mode): * desktop.el (desktop-save-mode): * dired-x.el (dired-omit-mode): * dirtrack.el (dirtrack-mode): * doc-view.el (doc-view-minor-mode): * double.el (double-mode): * electric.el (electric-indent-mode, electric-pair-mode): * emacs-lock.el (emacs-lock-mode): * epa-hook.el (auto-encryption-mode): * follow.el (follow-mode): * font-core.el (font-lock-mode): * frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode): * help.el (temp-buffer-resize-mode): * hilit-chg.el (highlight-changes-mode) (highlight-changes-visible-mode): * hi-lock.el (hi-lock-mode): * hl-line.el (hl-line-mode, global-hl-line-mode): * icomplete.el (icomplete-mode): * ido.el (ido-everywhere): * image-file.el (auto-image-file-mode): * image-mode.el (image-minor-mode): * iswitchb.el (iswitchb-mode): * jka-cmpr-hook.el (auto-compression-mode): * linum.el (linum-mode): * longlines.el (longlines-mode): * master.el (master-mode): * mb-depth.el (minibuffer-depth-indicate-mode): * menu-bar.el (menu-bar-mode): * minibuf-eldef.el (minibuffer-electric-default-mode): * mouse-sel.el (mouse-sel-mode): * msb.el (msb-mode): * mwheel.el (mouse-wheel-mode): * outline.el (outline-minor-mode): * paren.el (show-paren-mode): * recentf.el (recentf-mode): * reveal.el (reveal-mode, global-reveal-mode): * rfn-eshadow.el (file-name-shadow-mode): * ruler-mode.el (ruler-mode): * savehist.el (savehist-mode): * scroll-all.el (scroll-all-mode): * scroll-bar.el (scroll-bar-mode): * server.el (server-mode): * shell.el (shell-dirtrack-mode): * simple.el (auto-fill-mode, transient-mark-mode) (visual-line-mode, overwrite-mode, binary-overwrite-mode) (line-number-mode, column-number-mode, size-indication-mode) (auto-save-mode, normal-erase-is-backspace-mode, visible-mode): * strokes.el (strokes-mode): * time.el (display-time-mode): * t-mouse.el (gpm-mouse-mode): * tool-bar.el (tool-bar-mode): * tooltip.el (tooltip-mode): * type-break.el (type-break-mode-line-message-mode) (type-break-query-mode): * view.el (view-mode): * whitespace.el (whitespace-mode, whitespace-newline-mode) (global-whitespace-mode, global-whitespace-newline-mode): * xt-mouse.el (xterm-mouse-mode): Doc fix. * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix autogenerated docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-19 09:10:10 +0000 +++ lisp/ChangeLog 2011-10-19 12:54:24 +0000 @@ -1,3 +1,79 @@ +2011-10-19 Chong Yidong + + Doc fix for minor modes, stating that an omitted argument enables + the mode unconditionally when called from Lisp. + + * abbrev.el (abbrev-mode): + * allout.el (allout-mode): + * autoinsert.el (auto-insert-mode): + * autoarg.el (autoarg-mode, autoarg-kp-mode): + * autorevert.el (auto-revert-mode, auto-revert-tail-mode) + (global-auto-revert-mode): + * battery.el (display-battery-mode): + * composite.el (global-auto-composition-mode) + (auto-composition-mode): + * delsel.el (delete-selection-mode): + * desktop.el (desktop-save-mode): + * dired-x.el (dired-omit-mode): + * dirtrack.el (dirtrack-mode): + * doc-view.el (doc-view-minor-mode): + * double.el (double-mode): + * electric.el (electric-indent-mode, electric-pair-mode): + * emacs-lock.el (emacs-lock-mode): + * epa-hook.el (auto-encryption-mode): + * follow.el (follow-mode): + * font-core.el (font-lock-mode): + * frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode): + * help.el (temp-buffer-resize-mode): + * hilit-chg.el (highlight-changes-mode) + (highlight-changes-visible-mode): + * hi-lock.el (hi-lock-mode): + * hl-line.el (hl-line-mode, global-hl-line-mode): + * icomplete.el (icomplete-mode): + * ido.el (ido-everywhere): + * image-file.el (auto-image-file-mode): + * image-mode.el (image-minor-mode): + * iswitchb.el (iswitchb-mode): + * jka-cmpr-hook.el (auto-compression-mode): + * linum.el (linum-mode): + * longlines.el (longlines-mode): + * master.el (master-mode): + * mb-depth.el (minibuffer-depth-indicate-mode): + * menu-bar.el (menu-bar-mode): + * minibuf-eldef.el (minibuffer-electric-default-mode): + * mouse-sel.el (mouse-sel-mode): + * msb.el (msb-mode): + * mwheel.el (mouse-wheel-mode): + * outline.el (outline-minor-mode): + * paren.el (show-paren-mode): + * recentf.el (recentf-mode): + * reveal.el (reveal-mode, global-reveal-mode): + * rfn-eshadow.el (file-name-shadow-mode): + * ruler-mode.el (ruler-mode): + * savehist.el (savehist-mode): + * scroll-all.el (scroll-all-mode): + * scroll-bar.el (scroll-bar-mode): + * server.el (server-mode): + * shell.el (shell-dirtrack-mode): + * simple.el (auto-fill-mode, transient-mark-mode) + (visual-line-mode, overwrite-mode, binary-overwrite-mode) + (line-number-mode, column-number-mode, size-indication-mode) + (auto-save-mode, normal-erase-is-backspace-mode, visible-mode): + * strokes.el (strokes-mode): + * time.el (display-time-mode): + * t-mouse.el (gpm-mouse-mode): + * tool-bar.el (tool-bar-mode): + * tooltip.el (tooltip-mode): + * type-break.el (type-break-mode-line-message-mode) + (type-break-query-mode): + * view.el (view-mode): + * whitespace.el (whitespace-mode, whitespace-newline-mode) + (global-whitespace-mode, global-whitespace-newline-mode): + * xt-mouse.el (xterm-mouse-mode): Doc fix. + + * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix + autogenerated docstring. + 2011-10-19 Juri Linkov * net/browse-url.el (browse-url-can-use-xdg-open): Support LXDE === modified file 'lisp/abbrev.el' --- lisp/abbrev.el 2011-09-02 16:38:40 +0000 +++ lisp/abbrev.el 2011-10-19 12:54:24 +0000 @@ -54,9 +54,12 @@ (define-minor-mode abbrev-mode "Toggle Abbrev mode in the current buffer. -With optional argument ARG, turn abbrev mode on if ARG is -positive, otherwise turn it off. In Abbrev mode, inserting an -abbreviation causes it to expand and be replaced by its expansion." +With a prefix argument ARG, enable Abbrev mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Abbrev mode if ARG is omitted or nil. + +In Abbrev mode, inserting an abbreviation causes it to expand and +be replaced by its expansion." ;; It's defined in C, this stops the d-m-m macro defining it again. :variable abbrev-mode) === modified file 'lisp/allout-widgets.el' --- lisp/allout-widgets.el 2011-07-05 18:54:08 +0000 +++ lisp/allout-widgets.el 2011-10-19 12:54:24 +0000 @@ -486,13 +486,14 @@ ;;;_ > define-minor-mode allout-widgets-mode (arg) ;;;###autoload (define-minor-mode allout-widgets-mode - "Allout-mode extension, providing graphical decoration of outline structure. - -This is meant to operate along with allout-mode, via `allout-mode-hook'. - -If optional argument ARG is greater than 0, enable. -If optional argument ARG is less than 0, disable. -Anything else, toggle between active and inactive. + "Toggle Allout Widgets mode. +With a prefix argument ARG, enable Allout Widgets mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Allout Widgets mode is an extension of Allout mode that provides +graphical decoration of outline structure. It is meant to +operate along with `allout-mode', via `allout-mode-hook'. The graphics include: === modified file 'lisp/allout.el' --- lisp/allout.el 2011-09-24 20:58:23 +0000 +++ lisp/allout.el 2011-10-19 12:54:24 +0000 @@ -1702,17 +1702,19 @@ ;;;###autoload (define-minor-mode allout-mode ;;;_ . Doc string: - "Toggle minor mode for controlling exposure and editing of text outlines. + "Toggle Allout outline mode. +With a prefix argument ARG, enable Allout outline mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + \\ - -Allout outline mode always runs as a minor mode. - -Allout outline mode provides extensive outline oriented -formatting and manipulation. It enables structural editing of -outlines, as well as navigation and exposure. It also is -specifically aimed at accommodating syntax-sensitive text like -programming languages. \(For example, see the allout code itself, -which is organized as an allout outline.) +Allout outline mode is a minor mode that provides extensive +outline oriented formatting and manipulation. It enables +structural editing of outlines, as well as navigation and +exposure. It also is specifically aimed at accommodating +syntax-sensitive text like programming languages. \(For example, +see the allout code itself, which is organized as an allout +outline.) In addition to typical outline navigation and exposure, allout includes: === modified file 'lisp/autoarg.el' --- lisp/autoarg.el 2011-01-25 04:08:28 +0000 +++ lisp/autoarg.el 2011-10-19 12:54:24 +0000 @@ -90,15 +90,19 @@ ;;;###autoload (define-minor-mode autoarg-mode - "Toggle Autoarg minor mode globally. -With ARG, turn Autoarg mode on if ARG is positive, off otherwise. + "Toggle Autoarg mode, a global minor mode. +With a prefix argument ARG, enable Autoarg mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + \\ -In Autoarg mode digits are bound to `digit-argument' -- i.e. they -supply prefix arguments as C-DIGIT and M-DIGIT normally do -- and -C-DIGIT inserts DIGIT. \\[autoarg-terminate] terminates the prefix sequence -and inserts the digits of the autoarg sequence into the buffer. -Without a numeric prefix arg the normal binding of \\[autoarg-terminate] is -invoked, i.e. what it would be with Autoarg mode off. +In Autoarg mode, digits are bound to `digit-argument', i.e. they +supply prefix arguments as C-DIGIT and M-DIGIT normally do. +Furthermore, C-DIGIT inserts DIGIT. +\\[autoarg-terminate] terminates the prefix sequence and inserts +the digits of the autoarg sequence into the buffer. +Without a numeric prefix arg, the normal binding of \\[autoarg-terminate] +is invoked, i.e. what it would be with Autoarg mode off. For example: `6 9 \\[autoarg-terminate]' inserts `69' into the buffer, as does `C-6 C-9'. @@ -112,11 +116,14 @@ ;;;###autoload (define-minor-mode autoarg-kp-mode - "Toggle Autoarg-KP minor mode globally. -With ARG, turn Autoarg mode on if ARG is positive, off otherwise. + "Toggle Autoarg-KP mode, a global minor mode. +With a prefix argument ARG, enable Autoarg-KP mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + \\ -This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1' -etc. to supply digit arguments. +This is similar to `autoarg-mode' but rebinds the keypad keys +`kp-1' etc. to supply digit arguments. \\{autoarg-kp-mode-map}" nil " Aakp" autoarg-kp-mode-map :global t :group 'keyboard === modified file 'lisp/autoinsert.el' --- lisp/autoinsert.el 2011-09-02 16:38:40 +0000 +++ lisp/autoinsert.el 2011-10-19 12:54:24 +0000 @@ -397,9 +397,10 @@ ;;;###autoload (define-minor-mode auto-insert-mode - "Toggle Auto-insert mode. -With prefix ARG, turn Auto-insert mode on if and only if ARG is positive. -Returns the new status of Auto-insert mode (non-nil means on). + "Toggle Auto-insert mode, a global minor mode. +With a prefix argument ARG, enable Auto-insert mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. When Auto-insert mode is enabled, when new files are created you can insert a template for the file depending on the mode of the buffer." === modified file 'lisp/autorevert.el' --- lisp/autorevert.el 2011-04-13 14:27:41 +0000 +++ lisp/autorevert.el 2011-10-19 12:54:24 +0000 @@ -284,10 +284,15 @@ ;;;###autoload (define-minor-mode auto-revert-mode - "Toggle reverting buffer when file on disk changes. - -With arg, turn Auto Revert mode on if and only if arg is positive. -This is a minor mode that affects only the current buffer. + "Toggle reverting buffer when the file changes (Auto Revert mode). +With a prefix argument ARG, enable Auto Revert mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Auto Revert mode is a minor mode that affects only the current +buffer. When enabled, it reverts the buffer when the file on +disk changes. + Use `global-auto-revert-mode' to automatically revert all buffers. Use `auto-revert-tail-mode' if you know that the file will only grow without being changed in the part that is already in the buffer." @@ -314,14 +319,16 @@ ;;;###autoload (define-minor-mode auto-revert-tail-mode - "Toggle reverting tail of buffer when file on disk grows. -With arg, turn Tail mode on if arg is positive, otherwise turn it off. + "Toggle reverting tail of buffer when the file grows. +With a prefix argument ARG, enable Auto-Revert Tail mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -When Tail mode is enabled, the tail of the file is constantly -followed, as with the shell command `tail -f'. This means that -whenever the file grows on disk (presumably because some -background process is appending to it from time to time), this is -reflected in the current buffer. +When Auto Revert Tail mode is enabled, the tail of the file is +constantly followed, as with the shell command `tail -f'. This +means that whenever the file grows on disk (presumably because +some background process is appending to it from time to time), +this is reflected in the current buffer. You can edit the buffer and turn this mode off and on again as you please. But make sure the background process has stopped @@ -367,7 +374,7 @@ ;;;###autoload (defun turn-on-auto-revert-tail-mode () - "Turn on Auto-Revert Tail Mode. + "Turn on Auto-Revert Tail mode. This function is designed to be added to hooks, for example: (add-hook 'my-logfile-mode-hook 'turn-on-auto-revert-tail-mode)" @@ -377,12 +384,13 @@ ;;;###autoload (define-minor-mode global-auto-revert-mode "Toggle Global Auto Revert mode. -With optional prefix argument ARG, enable Global Auto Revert Mode -if ARG > 0, else disable it. +With a prefix argument ARG, enable Global Auto Revert mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -This is a global minor mode that reverts any buffer associated -with a file when the file changes on disk. Use `auto-revert-mode' -to revert a particular buffer. +Global Auto Revert mode is a global minor mode that reverts any +buffer associated with a file when the file changes on disk. Use +`auto-revert-mode' to revert a particular buffer. If `global-auto-revert-non-file-buffers' is non-nil, this mode may also revert some non-file buffers, as described in the === modified file 'lisp/battery.el' --- lisp/battery.el 2011-08-25 19:49:57 +0000 +++ lisp/battery.el 2011-10-19 12:54:24 +0000 @@ -164,10 +164,14 @@ ;;;###autoload (define-minor-mode display-battery-mode - "Display battery status information in the mode line. -The text being displayed in the mode line is controlled by the variables + "Toggle battery status display in mode line (Display Battery mode). +With a prefix argument ARG, enable Display Battery mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +The text displayed in the mode line is controlled by `battery-mode-line-format' and `battery-status-function'. -The mode line will be updated automatically every `battery-update-interval' +The mode line is be updated every `battery-update-interval' seconds." :global t :group 'battery (setq battery-mode-line-string "") === modified file 'lisp/composite.el' --- lisp/composite.el 2011-04-19 13:44:55 +0000 +++ lisp/composite.el 2011-10-19 12:54:24 +0000 @@ -728,12 +728,13 @@ ;;;###autoload (define-minor-mode auto-composition-mode "Toggle Auto Composition mode. -With ARG, turn Auto Composition mode off if and only if ARG is a non-positive -number; if ARG is nil, toggle Auto Composition mode; anything else turns Auto -Composition on. +With a prefix argument ARG, enable Auto Composition mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -When Auto Composition is enabled, text characters are automatically composed -by functions registered in `composition-function-table' (which see). +When Auto Composition mode is enabled, text characters are +automatically composed by functions registered in +`composition-function-table'. You can use `global-auto-composition-mode' to turn on Auto Composition mode in all buffers (this is the default)." @@ -744,10 +745,13 @@ ;;;###autoload (define-minor-mode global-auto-composition-mode - "Toggle Auto-Composition mode in every possible buffer. -With prefix arg, turn Global-Auto-Composition mode on if and only if arg -is positive. -See `auto-composition-mode' for more information on Auto-Composition mode." + "Toggle Auto Composition mode in all buffers. +With a prefix argument ARG, enable it if ARG is positive, and +disable it otherwise. If called from Lisp, enable it if ARG is +omitted or nil. + +For more information on Auto Composition mode, see +`auto-composition-mode' ." :variable (default-value 'auto-composition-mode)) (defalias 'toggle-auto-composition 'auto-composition-mode) === modified file 'lisp/delsel.el' --- lisp/delsel.el 2011-01-25 04:08:28 +0000 +++ lisp/delsel.el 2011-10-19 12:54:24 +0000 @@ -56,8 +56,9 @@ ;;;###autoload (define-minor-mode delete-selection-mode "Toggle Delete Selection mode. -With prefix ARG, turn Delete Selection mode on if ARG is -positive, off if ARG is not positive. +With a prefix argument ARG, enable Delete Selection mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. When Delete Selection mode is enabled, Transient Mark mode is also enabled and typed text replaces the selection if the selection is === modified file 'lisp/desktop.el' --- lisp/desktop.el 2011-04-19 13:44:55 +0000 +++ lisp/desktop.el 2011-10-19 12:54:24 +0000 @@ -147,11 +147,14 @@ ;;;###autoload (define-minor-mode desktop-save-mode - "Toggle desktop saving mode. -With numeric ARG, turn desktop saving on if ARG is positive, off -otherwise. If desktop saving is turned on, the state of Emacs is -saved from one session to another. See variable `desktop-save' -and function `desktop-read' for details." + "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." :global t :group 'desktop) === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-07-12 07:26:48 +0000 +++ lisp/dired-x.el 2011-10-19 12:54:24 +0000 @@ -133,16 +133,20 @@ :group 'dired-x) (define-minor-mode dired-omit-mode - "Toggle Dired-Omit mode. -With numeric ARG, enable Dired-Omit mode if ARG is positive, disable -otherwise. Enabling and disabling is buffer-local. -If enabled, \"uninteresting\" files are not listed. -Uninteresting files are those whose filenames match regexp `dired-omit-files', -plus those ending with extensions in `dired-omit-extensions'. - -To enable omitting in every Dired buffer, you can put in your ~/.emacs - - (add-hook 'dired-mode-hook (lambda () (dired-omit-mode 1))) + "Toggle omission of uninteresting files in Dired (Dired-Omit mode). +With a prefix argument ARG, enable Dired-Omit mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Dired-Omit mode is a buffer-local minor mode. When enabled in a +Dired buffer, Dired does not list files whose filenames match +regexp `dired-omit-files', nor files ending with extensions in +`dired-omit-extensions'. + +To enable omitting in every Dired buffer, you can put this in +your init file: + + (add-hook 'dired-mode-hook (lambda () (dired-omit-mode))) See Info node `(dired-x) Omitting Variables' for more information." :group 'dired-x === modified file 'lisp/dired.el' --- lisp/dired.el 2011-09-18 20:43:20 +0000 +++ lisp/dired.el 2011-10-19 12:54:24 +0000 @@ -4128,7 +4128,7 @@ ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump) -;;;;;; "dired-x" "dired-x.el" "219648338c42c7912fa336680b434db0") +;;;;;; "dired-x" "dired-x.el" "0a19e4cb2cadf007be715af1035c9c36") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ === modified file 'lisp/dirtrack.el' --- lisp/dirtrack.el 2011-10-17 19:48:28 +0000 +++ lisp/dirtrack.el 2011-10-19 12:54:24 +0000 @@ -183,7 +183,11 @@ ;;;###autoload (define-minor-mode dirtrack-mode - "Enable or disable Dirtrack directory tracking in a shell buffer. + "Toggle directory tracking in shell buffers (Dirtrack mode). +With a prefix argument ARG, enable Dirtrack mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + This method requires that your shell prompt contain the full current working directory at all times, and that `dirtrack-list' is set to match the prompt. This is an alternative to @@ -199,7 +203,7 @@ (define-minor-mode dirtrack-debug-mode - "Enable or disable Dirtrack debugging." + "Toggle Dirtrack debugging." nil nil nil (if dirtrack-debug-mode (display-buffer (get-buffer-create dirtrack-debug-buffer)))) === modified file 'lisp/doc-view.el' --- lisp/doc-view.el 2011-07-16 19:38:25 +0000 +++ lisp/doc-view.el 2011-10-19 12:54:24 +0000 @@ -1502,8 +1502,11 @@ ;;;###autoload (define-minor-mode doc-view-minor-mode - "Toggle Doc view minor mode. -With arg, turn Doc view minor mode on if arg is positive, off otherwise. + "Toggle displaying buffer via Doc View (Doc View minor mode). +With a prefix argument ARG, enable Doc View minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + See the command `doc-view-mode' for more information on this mode." nil " DocView" doc-view-minor-mode-map :group 'doc-view === modified file 'lisp/double.el' --- lisp/double.el 2011-01-25 04:08:28 +0000 +++ lisp/double.el 2011-10-19 12:54:24 +0000 @@ -146,12 +146,13 @@ ;;;###autoload (define-minor-mode double-mode - "Toggle Double mode. -With prefix argument ARG, turn Double mode on if ARG is positive, otherwise -turn it off. + "Toggle special insertion on double keypresses (Double mode). +With a prefix argument ARG, enable Double mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -When Double mode is on, some keys will insert different strings -when pressed twice. See variable `double-map' for details." +When Double mode is enabled, some keys will insert different +strings when pressed twice. See `double-map' for details." :lighter " Double" :link '(emacs-commentary-link "double") (kill-local-variable 'key-translation-map) === modified file 'lisp/electric.el' --- lisp/electric.el 2011-04-19 13:44:55 +0000 +++ lisp/electric.el 2011-10-19 12:54:24 +0000 @@ -241,8 +241,14 @@ ;;;###autoload (define-minor-mode electric-indent-mode - "Automatically reindent lines of code when inserting particular chars. -`electric-indent-chars' specifies the set of chars that should cause reindentation." + "Toggle on-the-fly reindentation (Electric Indent mode). +With a prefix argument ARG, enable Electric Indent mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Electric Indent mode is a global minor mode. When enabled, +reindentation is triggered whenever you insert a character listed +in `electric-indent-chars'." :global t :group 'electricity (if electric-indent-mode @@ -330,7 +336,14 @@ ;;;###autoload (define-minor-mode electric-pair-mode - "Automatically pair-up parens when inserting an open paren." + "Toggle automatic parens pairing (Electric Pair mode). +With a prefix argument ARG, enable Electric Pair mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Electric Pair mode is a global minor mode. When enabled, typing +an open parenthesis automatically inserts the corresponding +closing parenthesis. \(Likewise for brackets, etc.)" :global t :group 'electricity (if electric-pair-mode === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2011-01-25 04:08:28 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2011-10-19 12:54:24 +0000 @@ -350,14 +350,16 @@ (define-minor-mode ,global-mode ;; Very short lines to avoid too long lines in the generated ;; doc string. - ,(format "Toggle %s in every possible buffer. -With prefix ARG, turn %s on if and only if -ARG is positive. + ,(format "Toggle %s in all buffers. +With prefix ARG, enable %s if ARG is positive; +otherwise, disable it. If called from Lisp, enable the mode if +ARG is omitted or nil. + %s is enabled in all buffers where \`%s' would do it. See `%s' for more information on %s." - pretty-name pretty-global-name pretty-name turn-on - mode pretty-name) + pretty-name pretty-global-name + pretty-name turn-on mode pretty-name) :global t ,@group ,@(nreverse extra-keywords) ;; Setup hook to handle future mode changes and new buffers. === modified file 'lisp/emacs-lock.el' --- lisp/emacs-lock.el 2011-07-05 15:09:19 +0000 +++ lisp/emacs-lock.el 2011-10-19 12:54:24 +0000 @@ -176,14 +176,16 @@ ;;;###autoload (define-minor-mode emacs-lock-mode - "Toggle Emacs Lock mode in the current buffer. - -With \\[universal-argument], ask for the locking mode to be used. -With other prefix ARG, turn mode on if ARG is positive, off otherwise. - -Initially, if the user does not pass an explicit locking mode, it defaults -to `emacs-lock-default-locking-mode' (which see); afterwards, the locking -mode most recently set on the buffer is used instead. + "Toggle Emacs Lock mode in the current buffer. +If called with a plain prefix argument, ask for the locking mode +to be used. With any other prefix ARG, turn mode on if ARG is +positive, off otherwise. If called from Lisp, enable the mode if +ARG is omitted or nil. + +Initially, if the user does not pass an explicit locking mode, it +defaults to `emacs-lock-default-locking-mode' (which see); +afterwards, the locking mode most recently set on the buffer is +used instead. When called from Elisp code, ARG can be any locking mode: === modified file 'lisp/epa-hook.el' --- lisp/epa-hook.el 2011-04-04 06:16:23 +0000 +++ lisp/epa-hook.el 2011-10-19 12:54:24 +0000 @@ -49,7 +49,7 @@ :group 'epa-file) (defvar epa-file-encrypt-to nil - "*Recipient(s) used for encrypting files. + "Recipient(s) used for encrypting files. May either be a string or a list of strings.") (put 'epa-file-encrypt-to 'safe-local-variable @@ -83,9 +83,10 @@ (auto-save-mode 0))) (define-minor-mode auto-encryption-mode - "Toggle automatic file encryption and decryption. -With prefix argument ARG, turn auto encryption on if positive, else off. -Return the new status of auto encryption (non-nil means on)." + "Toggle automatic file encryption/decryption (Auto Encryption mode). +With a prefix argument ARG, enable Auto Encryption mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :global t :init-value t :group 'epa-file :version "23.1" ;; We'd like to use custom-initialize-set here so the setup is done ;; before dumping, but at the point where the defcustom is evaluated, === modified file 'lisp/face-remap.el' --- lisp/face-remap.el 2011-01-25 04:08:28 +0000 +++ lisp/face-remap.el 2011-10-19 12:54:24 +0000 @@ -204,7 +204,7 @@ (make-variable-buffer-local 'text-scale-mode-amount) (define-minor-mode text-scale-mode - "Minor mode for displaying buffer text in a larger/smaller font than usual. + "Minor mode for displaying buffer text in a larger/smaller font. The amount of scaling is determined by the variable `text-scale-mode-amount': one step scales the global default === modified file 'lisp/follow.el' --- lisp/follow.el 2011-07-14 01:09:00 +0000 +++ lisp/follow.el 2011-10-19 12:54:24 +0000 @@ -484,10 +484,13 @@ (put 'follow-mode 'permanent-local t) ;;;###autoload (define-minor-mode follow-mode - "Minor mode that combines windows into one tall virtual window. + "Toggle Follow mode. +With a prefix argument ARG, enable Follow mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -The feeling of a \"virtual window\" has been accomplished by the use -of two major techniques: +Follow mode is a minor mode that combines windows into one tall +virtual window. This is accomplished by two main techniques: * The windows always displays adjacent sections of the buffer. This means that whenever one window is moved, all the === modified file 'lisp/font-core.el' --- lisp/font-core.el 2011-01-26 08:36:39 +0000 +++ lisp/font-core.el 2011-10-19 12:54:24 +0000 @@ -86,12 +86,12 @@ ;; The mode for which font-lock was initialized, or nil if none. (defvar font-lock-major-mode) + (define-minor-mode font-lock-mode - "Toggle Font Lock mode. -With arg, turn Font Lock mode off if and only if arg is a non-positive -number; if arg is nil, toggle Font Lock mode; anything else turns Font -Lock on. -\(Font Lock is also known as \"syntax highlighting\".) + "Toggle syntax highlighting in this buffer (Font Lock mode). +With a prefix argument ARG, enable Font Lock mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. When Font Lock mode is enabled, text is fontified as you type it: === modified file 'lisp/frame.el' --- lisp/frame.el 2011-09-11 21:47:39 +0000 +++ lisp/frame.el 2011-10-19 12:54:24 +0000 @@ -1134,7 +1134,10 @@ (define-minor-mode auto-raise-mode "Toggle whether or not the selected frame should auto-raise. -With ARG, turn auto-raise mode on if and only if ARG is positive. +With a prefix argument ARG, enable Auto Raise mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + Note that this controls Emacs's own auto-raise feature. Some window managers allow you to enable auto-raise for certain windows. You can use that for Emacs windows if you wish, but if you do, @@ -1145,7 +1148,10 @@ (define-minor-mode auto-lower-mode "Toggle whether or not the selected frame should auto-lower. -With ARG, turn auto-lower mode on if and only if ARG is positive. +With a prefix argument ARG, enable Auto Lower mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + Note that this controls Emacs's own auto-lower feature. Some window managers allow you to enable auto-lower for certain windows. You can use that for Emacs windows if you wish, but if you do, @@ -1556,14 +1562,13 @@ (setq blink-cursor-timer nil))) (define-minor-mode blink-cursor-mode - "Toggle blinking cursor mode. -With a numeric argument, turn blinking cursor mode on if ARG is positive, -otherwise turn it off. When blinking cursor mode is enabled, the -cursor of the selected window blinks. + "Toggle cursor blinking (Blink Cursor mode). +With a prefix argument ARG, enable Blink Cursor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -Note that this command is effective only when Emacs -displays through a window system, because then Emacs does its own -cursor display. On a text-only terminal, this is not implemented." +This command is effective only on graphical frames. On text-only +terminals, cursor blinking is controlled by the terminal." :init-value (not (or noninteractive no-blinking-cursor (eq system-type 'ms-dos) === modified file 'lisp/help.el' --- lisp/help.el 2011-09-29 08:16:15 +0000 +++ lisp/help.el 2011-10-19 12:54:24 +0000 @@ -977,13 +977,15 @@ :version "20.4") (define-minor-mode temp-buffer-resize-mode - "Toggle mode which makes windows smaller for temporary buffers. -With prefix argument ARG, turn the resizing of windows displaying -temporary buffers on if ARG is positive or off otherwise. + "Toggle auto-shrinking temp buffer windows (Temp Buffer Resize mode). +With a prefix argument ARG, enable Temp Buffer Resize mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -This mode makes a window the right height for its contents, but -never more than `temp-buffer-max-height' nor less than -`window-min-height'. +When Temp Buffer Resize mode is enabled, the windows in which we +show a temporary buffer are automatically reduced in height to +fit the buffer's contents, but never more than +`temp-buffer-max-height' nor less than `window-min-height'. This mode is used by `help', `apropos' and `completion' buffers, and some others." === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2011-08-09 22:13:11 +0000 +++ lisp/hi-lock.el 2011-10-19 12:54:24 +0000 @@ -283,14 +283,17 @@ ;;;###autoload (define-minor-mode hi-lock-mode - "Toggle minor mode for interactively adding font-lock highlighting patterns. + "Toggle selective highlighting of patterns (Hi Lock mode). +With a prefix argument ARG, enable Hi Lock mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -If ARG positive, turn hi-lock on. Issuing a hi-lock command will also -turn hi-lock on. To turn hi-lock on in all buffers use -`global-hi-lock-mode' or in your .emacs file (global-hi-lock-mode 1). -When hi-lock is turned on, a \"Regexp Highlighting\" submenu is added -to the \"Edit\" menu. The commands in the submenu, which can be -called interactively, are: +Issuing one the highlighting commands listed below will +automatically enable Hi Lock mode. To enable Hi Lock mode in all +buffers, use `global-hi-lock-mode' or add (global-hi-lock-mode 1) +to your init file. When Hi Lock mode is enabled, a \"Regexp +Highlighting\" submenu is added to the \"Edit\" menu. The +commands in the submenu, which can be called interactively, are: \\[highlight-regexp] REGEXP FACE Highlight matches of pattern REGEXP in current buffer with FACE. === modified file 'lisp/hilit-chg.el' --- lisp/hilit-chg.el 2011-05-23 17:57:17 +0000 +++ lisp/hilit-chg.el 2011-10-19 12:54:24 +0000 @@ -326,14 +326,15 @@ ;;;###autoload (define-minor-mode highlight-changes-mode - "Toggle Highlight Changes mode. - -With ARG, turn Highlight Changes mode on if and only if arg is positive. - -In Highlight Changes mode changes are recorded with a text property. -Normally they are displayed in a distinctive face, but command -\\[highlight-changes-visible-mode] can be used to toggles this -on and off. + "Toggle highlighting changes in this buffer (Highlight Changes mode). +With a prefix argument ARG, enable Highlight Changes mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +When Highlight Changes is enabled, changes are marked with a text +property. Normally they are displayed in a distinctive face, but +command \\[highlight-changes-visible-mode] can be used to toggles +this on and off. Other functions for buffers in this mode include: \\[highlight-changes-next-change] - move point to beginning of next change @@ -366,14 +367,17 @@ ;;;###autoload (define-minor-mode highlight-changes-visible-mode - "Toggle visiblility of changes when buffer is in Highlight Changes mode. + "Toggle visiblility of highlighting due to Highlight Changes mode. +With a prefix argument ARG, enable Highlight Changes Visible mode +if ARG is positive, and disable it otherwise. If called from +Lisp, enable the mode if ARG is omitted or nil. -This mode only has an effect when Highlight Changes mode is on. -It allows toggling between whether or not the changed text is displayed +Highlight Changes Visible mode only has an effect when Highlight +Changes mode is on. When enabled, the changed text is displayed in a distinctive face. The default value can be customized with variable -`highlight-changes-visibility-initial-state' +`highlight-changes-visibility-initial-state'. This command does not itself set highlight-changes mode." === modified file 'lisp/hl-line.el' --- lisp/hl-line.el 2011-06-26 20:25:53 +0000 +++ lisp/hl-line.el 2011-10-19 12:54:24 +0000 @@ -124,10 +124,13 @@ ;;;###autoload (define-minor-mode hl-line-mode - "Buffer-local minor mode to highlight the line about point. -With ARG, turn Hl-Line mode on if ARG is positive, off otherwise. + "Toggle highlighting of the current line (Hl-Line mode). +With a prefix argument ARG, enable Hl-Line mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -If `hl-line-sticky-flag' is non-nil, Hl-Line mode highlights the +Hl-Line mode is a buffer-local minor mode. If +`hl-line-sticky-flag' is non-nil, Hl-Line mode highlights the line about the buffer's point in all windows. Caveat: the buffer's point might be different from the point of a non-selected window. Hl-Line mode uses the function @@ -171,8 +174,10 @@ ;;;###autoload (define-minor-mode global-hl-line-mode - "Global minor mode to highlight the line about point in the current window. -With ARG, turn Global-Hl-Line mode on if ARG is positive, off otherwise. + "Toggle line highlighting in all buffers (Global Hl-Line mode). +With a prefix argument ARG, enable Global Hl-Line mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. If `global-hl-line-sticky-flag' is non-nil, Global Hl-Line mode highlights the line about the current buffer's point in all === modified file 'lisp/ibuf-ext.el' --- lisp/ibuf-ext.el 2011-08-14 18:08:20 +0000 +++ lisp/ibuf-ext.el 2011-10-19 12:54:24 +0000 @@ -217,8 +217,10 @@ ;;;###autoload (define-minor-mode ibuffer-auto-mode - "Toggle use of Ibuffer's auto-update facility. -With numeric ARG, enable auto-update if and only if ARG is positive." + "Toggle use of Ibuffer's auto-update facility (Ibuffer Auto mode). +With a prefix argument ARG, enable Ibuffer Auto mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." nil nil nil (unless (derived-mode-p 'ibuffer-mode) (error "This buffer is not in Ibuffer mode")) === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2011-08-24 18:09:18 +0000 +++ lisp/ibuffer.el 2011-10-19 12:54:24 +0000 @@ -2648,12 +2648,14 @@ ;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group ;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group ;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode -;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "617b36fc8479547d679cf0103f82e3ff") +;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "25e69a1e030791b3a3e7d91d4377173a") ;;; Generated autoloads from ibuf-ext.el (autoload 'ibuffer-auto-mode "ibuf-ext" "\ -Toggle use of Ibuffer's auto-update facility. -With numeric ARG, enable auto-update if and only if ARG is positive. +Toggle use of Ibuffer's auto-update facility (Ibuffer Auto mode). +With a prefix argument ARG, enable Ibuffer Auto mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. \(fn &optional ARG)" t nil) === modified file 'lisp/icomplete.el' --- lisp/icomplete.el 2011-09-18 16:13:01 +0000 +++ lisp/icomplete.el 2011-10-19 12:54:24 +0000 @@ -172,9 +172,10 @@ ;;;_ > icomplete-mode (&optional prefix) ;;;###autoload (define-minor-mode icomplete-mode - "Toggle incremental minibuffer completion for this Emacs session. -With a numeric argument, turn Icomplete mode on if ARG is positive, -otherwise turn it off." + "Toggle incremental minibuffer completion (Icomplete mode). +With a prefix argument ARG, enable Icomplete mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :global t :group 'icomplete (if icomplete-mode ;; The following is not really necessary after first time - === modified file 'lisp/ido.el' --- lisp/ido.el 2011-10-17 13:27:53 +0000 +++ lisp/ido.el 2011-10-19 12:54:24 +0000 @@ -1469,8 +1469,10 @@ (add-hook 'choose-completion-string-functions 'ido-choose-completion-string)) (define-minor-mode ido-everywhere - "Toggle using ido-mode everywhere file and directory names are read. -With ARG, turn ido-mode on if arg is positive, off otherwise." + "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." :global t :group 'ido (when (get 'ido-everywhere 'file) === modified file 'lisp/image-file.el' --- lisp/image-file.el 2011-01-25 04:08:28 +0000 +++ lisp/image-file.el 2011-10-19 12:54:24 +0000 @@ -178,11 +178,12 @@ ;;;###autoload (define-minor-mode auto-image-file-mode - "Toggle visiting of image files as images. -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled. + "Toggle visiting of image files as images (Auto Image File mode). +With a prefix argument ARG, enable Auto Image File mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -Image files are those whose name has an extension in +An image file is one whose name has an extension in `image-file-name-extensions', or matches a regexp in `image-file-name-regexps'." :global t === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2011-09-19 19:27:30 +0000 +++ lisp/image-mode.el 2011-10-19 12:54:24 +0000 @@ -396,11 +396,14 @@ ;;;###autoload (define-minor-mode image-minor-mode - "Toggle Image minor mode. -With arg, turn Image minor mode on if arg is positive, off otherwise. -It provides the key \\\\[image-toggle-display] \ -to switch back to `image-mode' -to display an image file as the actual image." + "Toggle Image minor mode in this buffer. +With a prefix argument ARG, enable Image minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Image minor mode provides the key \\\\[image-toggle-display], +to switch back to `image-mode' and display an image file as the +actual image." nil (:eval (if image-type (format " Image[%s]" image-type) " Image")) image-minor-mode-map :group 'image === modified file 'lisp/iswitchb.el' --- lisp/iswitchb.el 2011-08-30 22:43:43 +0000 +++ lisp/iswitchb.el 2011-10-19 12:54:24 +0000 @@ -1424,10 +1424,13 @@ ;;;###autoload (define-minor-mode iswitchb-mode - "Toggle Iswitchb global minor mode. -With arg, turn Iswitchb mode on if ARG is positive, otherwise turn it off. -This mode enables switching between buffers using substrings. See -`iswitchb' for details." + "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." nil nil iswitchb-global-map :global t :group 'iswitchb (if iswitchb-mode (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup) === modified file 'lisp/jka-cmpr-hook.el' --- lisp/jka-cmpr-hook.el 2011-07-15 17:18:53 +0000 +++ lisp/jka-cmpr-hook.el 2011-10-19 12:54:24 +0000 @@ -333,9 +333,14 @@ :group 'jka-compr) (define-minor-mode auto-compression-mode - "Toggle automatic file compression and uncompression. -With prefix argument ARG, turn auto compression on if positive, else off. -Return the new status of auto compression (non-nil means on)." + "Toggle Auto Compression mode. +With a prefix argument ARG, enable Auto Compression mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +Auto Compression mode is a global minor mode. When enabled, +compressed files are automatically uncompressed for reading, and +compressed when writing." :global t :init-value t :group 'jka-compr :version "22.1" (let* ((installed (jka-compr-installed-p)) (flag auto-compression-mode)) === modified file 'lisp/linum.el' --- lisp/linum.el 2011-04-04 09:35:16 +0000 +++ lisp/linum.el 2011-10-19 12:54:24 +0000 @@ -73,7 +73,12 @@ ;;;###autoload (define-minor-mode linum-mode - "Toggle display of line numbers in the left margin." + "Toggle display of line numbers in the left margin (Linum mode). +With a prefix argument ARG, enable Linum mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. + +Linum mode is a buffer-local minor mode." :lighter "" ; for desktop.el (if linum-mode (progn === modified file 'lisp/longlines.el' --- lisp/longlines.el 2011-08-07 14:14:54 +0000 +++ lisp/longlines.el 2011-10-19 12:54:24 +0000 @@ -95,21 +95,22 @@ ;;;###autoload (define-minor-mode longlines-mode - "Minor mode to wrap long lines. -In Long Lines mode, long lines are wrapped if they extend beyond -`fill-column'. The soft newlines used for line wrapping will not -show up when the text is yanked or saved to disk. - -With no argument, this command toggles Long Lines mode. -With a prefix argument ARG, turn Long Lines minor mode on if ARG is positive, -otherwise turn it off. - -If the variable `longlines-auto-wrap' is non-nil, lines are automatically -wrapped whenever the buffer is changed. You can always call -`fill-paragraph' to fill individual paragraphs. - -If the variable `longlines-show-hard-newlines' is non-nil, hard newlines -are indicated with a symbol." + "Toggle Long Lines mode in this buffer. +With a prefix argument ARG, enable Long Lines mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Long Lines mode is enabled, long lines are wrapped if they +extend beyond `fill-column'. The soft newlines used for line +wrapping will not show up when the text is yanked or saved to +disk. + +If the variable `longlines-auto-wrap' is non-nil, lines are +automatically wrapped whenever the buffer is changed. You can +always call `fill-paragraph' to fill individual paragraphs. + +If the variable `longlines-show-hard-newlines' is non-nil, hard +newlines are indicated with a symbol." :group 'longlines :lighter " ll" (if longlines-mode ;; Turn on longlines mode === modified file 'lisp/master.el' --- lisp/master.el 2011-01-26 08:36:39 +0000 +++ lisp/master.el 2011-10-19 12:54:24 +0000 @@ -72,12 +72,12 @@ ;;;###autoload (define-minor-mode master-mode "Toggle Master mode. -With no argument, this command toggles the mode. -Non-null prefix argument turns on the mode. -Null prefix argument turns off the mode. +With a prefix argument ARG, enable Master mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -When Master mode is enabled, you can scroll the slave buffer using the -following commands: +When Master mode is enabled, you can scroll the slave buffer +using the following commands: \\{master-mode-map} === modified file 'lisp/mb-depth.el' --- lisp/mb-depth.el 2011-01-25 04:08:28 +0000 +++ lisp/mb-depth.el 2011-10-19 12:54:24 +0000 @@ -56,12 +56,14 @@ ;;;###autoload (define-minor-mode minibuffer-depth-indicate-mode "Toggle Minibuffer Depth Indication mode. -When active, any recursive use of the minibuffer will show -the recursion depth in the minibuffer prompt. This is only -useful if `enable-recursive-minibuffers' is non-nil. +With a prefix argument ARG, enable Minibuffer Depth Indication +mode if ARG is positive, and disable it otherwise. If called +from Lisp, enable the mode if ARG is omitted or nil. -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled." +Minibuffer Depth Indication mode is a global minor mode. When +enabled, any recursive use of the minibuffer will show the +recursion depth in the minibuffer prompt. This is only useful if +`enable-recursive-minibuffers' is non-nil." :global t :group 'minibuffer (if minibuffer-depth-indicate-mode === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2011-10-17 12:52:31 +0000 +++ lisp/menu-bar.el 2011-10-19 12:54:24 +0000 @@ -2169,11 +2169,13 @@ :help ,(purecopy "Put previous minibuffer history element in the minibuffer")))) (define-minor-mode menu-bar-mode - "Toggle display of a menu bar on each frame. + "Toggle display of a menu bar on each frame (Menu Bar mode). +With a prefix argument ARG, enable Menu Bar mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Menu Bar mode if ARG is omitted or nil. + This command applies to all frames that exist and frames to be -created in the future. -With a numeric argument, if the argument is positive, -turn on menu bars; otherwise, turn off menu bars." +created in the future." :init-value t :global t ;; It's defined in C/cus-start, this stops the d-m-m macro defining it again. === modified file 'lisp/minibuf-eldef.el' --- lisp/minibuf-eldef.el 2011-01-25 04:08:28 +0000 +++ lisp/minibuf-eldef.el 2011-10-19 12:54:24 +0000 @@ -131,14 +131,16 @@ ;;;###autoload (define-minor-mode minibuffer-electric-default-mode "Toggle Minibuffer Electric Default mode. -When active, minibuffer prompts that show a default value only show the -default when it's applicable -- that is, when hitting RET would yield -the default value. If the user modifies the input such that hitting RET -would enter a non-default value, the prompt is modified to remove the -default indication. +With a prefix argument ARG, enable Minibuffer Electric Default +mode if ARG is positive, and disable it otherwise. If called +from Lisp, enable the mode if ARG is omitted or nil. -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled." +Minibuffer Electric Default mode is a global minor mode. When +enabled, minibuffer prompts that show a default value only show +the default when it's applicable -- that is, when hitting RET +would yield the default value. If the user modifies the input +such that hitting RET would enter a non-default value, the prompt +is modified to remove the default indication." :global t :group 'minibuffer (if minibuffer-electric-default-mode === modified file 'lisp/mouse-sel.el' --- lisp/mouse-sel.el 2011-07-12 21:59:09 +0000 +++ lisp/mouse-sel.el 2011-10-19 12:54:24 +0000 @@ -199,11 +199,12 @@ ;;;###autoload (define-minor-mode mouse-sel-mode "Toggle Mouse Sel mode. -With prefix ARG, turn Mouse Sel mode on if and only if ARG is positive. -Returns the new status of Mouse Sel mode (non-nil means on). +With a prefix argument ARG, enable Mouse Sel mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -When Mouse Sel mode is enabled, mouse selection is enhanced in -various ways: +Mouse Sel mode is a global minor mode. When enabled, mouse +selection is enhanced in various ways: - Double-clicking on symbol constituents selects symbols. Double-clicking on quotes or parentheses selects sexps. === modified file 'lisp/msb.el' --- lisp/msb.el 2011-05-23 17:57:17 +0000 +++ lisp/msb.el 2011-10-19 12:54:24 +0000 @@ -1133,7 +1133,10 @@ ;;;###autoload (define-minor-mode msb-mode "Toggle Msb mode. -With arg, turn Msb mode on if and only if arg is positive. +With a prefix argument ARG, enable Msb mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. + This mode overrides the binding(s) of `mouse-buffer-menu' to provide a different buffer menu using the function `msb'." :global t :group 'msb === modified file 'lisp/mwheel.el' --- lisp/mwheel.el 2011-01-25 04:08:28 +0000 +++ lisp/mwheel.el 2011-10-19 12:54:24 +0000 @@ -250,11 +250,11 @@ (defvar mwheel-installed-bindings nil) -;; preloaded ;;;###autoload (define-minor-mode mouse-wheel-mode - "Toggle mouse wheel support. -With prefix argument ARG, turn on if positive, otherwise off. -Return non-nil if the new state is enabled." + "Toggle mouse wheel support (Mouse Wheel mode). +With a prefix argument ARG, enable Mouse Wheel mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :init-value t ;; We'd like to use custom-initialize-set here so the setup is done ;; before dumping, but at the point where the defcustom is evaluated, === modified file 'lisp/outline.el' --- lisp/outline.el 2011-09-18 20:43:20 +0000 +++ lisp/outline.el 2011-10-19 12:54:24 +0000 @@ -356,7 +356,10 @@ ;;;###autoload (define-minor-mode outline-minor-mode "Toggle Outline minor mode. -With arg, turn Outline minor mode on if arg is positive, off otherwise. +With a prefix argument ARG, enable Outline minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + See the command `outline-mode' for more information on this mode." nil " Outl" (list (cons [menu-bar] outline-minor-mode-menu-bar-map) (cons outline-minor-mode-prefix outline-mode-prefix-map)) === modified file 'lisp/paren.el' --- lisp/paren.el 2011-09-10 11:28:19 +0000 +++ lisp/paren.el 2011-10-19 12:54:24 +0000 @@ -102,12 +102,14 @@ ;;;###autoload (define-minor-mode show-paren-mode - "Toggle Show Paren mode. -With prefix ARG, turn Show Paren mode on if and only if ARG is positive. -Returns the new status of Show Paren mode (non-nil means on). + "Toggle visualization of matching parens (Show Paren mode). +With a prefix argument ARG, enable Show Paren mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -When Show Paren mode is enabled, any matching parenthesis is highlighted -in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time." +Show Paren mode is a global minor mode. When enabled, any +matching parenthesis is highlighted in `show-paren-style' after +`show-paren-delay' seconds of Emacs idle time." :global t :group 'paren-showing ;; Enable or disable the mechanism. ;; First get rid of the old idle timer. === modified file 'lisp/recentf.el' --- lisp/recentf.el 2011-04-19 13:44:55 +0000 +++ lisp/recentf.el 2011-10-19 12:54:24 +0000 @@ -1336,12 +1336,14 @@ ;;;###autoload (define-minor-mode recentf-mode - "Toggle recentf mode. -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled. + "Toggle \"Open Recent\" menu (Recentf mode). +With a prefix argument ARG, enable Recentf mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Recentf mode if ARG is omitted or nil. -When recentf mode is enabled, it maintains a menu for visiting files -that were operated on recently." +When Recentf mode is enabled, a \"Open Recent\" submenu is +displayed in the \"File\" menu, containing a list of files that +were operated on recently." :global t :group 'recentf :keymap recentf-mode-map === modified file 'lisp/reveal.el' --- lisp/reveal.el 2011-03-11 20:04:22 +0000 +++ lisp/reveal.el 2011-10-19 12:54:24 +0000 @@ -189,12 +189,13 @@ ;;;###autoload (define-minor-mode reveal-mode - "Toggle Reveal mode on or off. -Reveal mode renders invisible text around point visible again. + "Toggle decloaking of invisible text near point (Reveal mode). +With a prefix argument ARG, enable Reveal mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Reveal mode if ARG is omitted or nil. -Interactively, with no prefix argument, toggle the mode. -With universal prefix ARG (or if ARG is nil) turn mode on. -With zero or negative ARG turn mode off." +Reveral mode is a buffer-local minor mode. When enabled, it +reveals invisible text around point." :group 'reveal :lighter (global-reveal-mode nil " Reveal") :keymap reveal-mode-map @@ -207,12 +208,12 @@ ;;;###autoload (define-minor-mode global-reveal-mode - "Toggle Reveal mode in all buffers on or off. + "Toggle Reveal mode in all buffers (Global Reveal mode). Reveal mode renders invisible text around point visible again. -Interactively, with no prefix argument, toggle the mode. -With universal prefix ARG (or if ARG is nil) turn mode on. -With zero or negative ARG turn mode off." +With a prefix argument ARG, enable Global Reveal mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :global t :group 'reveal (setq-default reveal-mode global-reveal-mode) (if global-reveal-mode === modified file 'lisp/rfn-eshadow.el' --- lisp/rfn-eshadow.el 2011-01-25 04:08:28 +0000 +++ lisp/rfn-eshadow.el 2011-10-19 12:54:24 +0000 @@ -207,15 +207,17 @@ (error nil))) (define-minor-mode file-name-shadow-mode - "Toggle File-Name Shadow mode. -When active, any part of a filename being read in the minibuffer -that would be ignored (because the result is passed through + "Toggle file-name shadowing in minibuffers (File-Name Shadow mode). +With a prefix argument ARG, enable File-Name Shadow mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +File-Name Shadow mode is a global minor mode. When enabled, any +part of a filename being read in the minibuffer that would be +ignored (because the result is passed through `substitute-in-file-name') is given the properties in -`file-name-shadow-properties', which can be used to make -that portion dim, invisible, or otherwise less visually noticeable. - -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled." +`file-name-shadow-properties', which can be used to make that +portion dim, invisible, or otherwise less visually noticeable." :global t ;; We'd like to use custom-initialize-set here so the setup is done ;; before dumping, but at the point where the defcustom is evaluated, === modified file 'lisp/ruler-mode.el' --- lisp/ruler-mode.el 2011-01-25 04:08:28 +0000 +++ lisp/ruler-mode.el 2011-10-19 12:54:24 +0000 @@ -567,8 +567,10 @@ ;;;###autoload (define-minor-mode ruler-mode - "Toggle Ruler mode. -In Ruler mode, Emacs displays a ruler in the header line." + "Toggle display of ruler in header line (Ruler mode). +With a prefix argument ARG, enable Ruler mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil." nil nil ruler-mode-map :group 'ruler-mode === modified file 'lisp/savehist.el' --- lisp/savehist.el 2011-04-19 13:44:55 +0000 +++ lisp/savehist.el 2011-10-19 12:54:24 +0000 @@ -170,15 +170,19 @@ ;;;###autoload (define-minor-mode savehist-mode - "Toggle savehist-mode. -Positive ARG turns on `savehist-mode'. When on, savehist-mode causes -minibuffer history to be saved periodically and when exiting Emacs. -When turned on for the first time in an Emacs session, it causes the -previous minibuffer history to be loaded from `savehist-file'. + "Toggle saving of minibuffer history (Savehist mode). +With a prefix argument ARG, enable Savehist mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Savehist mode is enabled, minibuffer history is saved +periodically and when exiting Emacs. When Savehist mode is +enabled for the first time in an Emacs session, it loads the +previous minibuffer history from `savehist-file'. This mode should normally be turned on from your Emacs init file. -Calling it at any other time replaces your current minibuffer histories, -which is probably undesirable." +Calling it at any other time replaces your current minibuffer +histories, which is probably undesirable." :global t (if (not savehist-mode) (savehist-uninstall) === modified file 'lisp/scroll-all.el' --- lisp/scroll-all.el 2011-01-25 04:08:28 +0000 +++ lisp/scroll-all.el 2011-10-19 12:54:24 +0000 @@ -101,10 +101,13 @@ ;;;###autoload (define-minor-mode scroll-all-mode - "Toggle Scroll-All minor mode. -With ARG, turn Scroll-All minor mode on if ARG is positive, off otherwise. -When Scroll-All mode is on, scrolling commands entered in one window -apply to all visible windows in the same frame." + "Toggle shared scrolling in same-frame windows (Scroll-All mode). +With a prefix argument ARG, enable Scroll-All mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Scroll-All mode is enabled, scrolling commands invoked in +one window apply to all visible windows in the same frame." nil " *SL*" nil :global t :group 'windows === modified file 'lisp/scroll-bar.el' --- lisp/scroll-bar.el 2011-07-14 17:11:49 +0000 +++ lisp/scroll-bar.el 2011-10-19 12:54:24 +0000 @@ -114,12 +114,15 @@ (defun get-scroll-bar-mode () scroll-bar-mode) (defsetf get-scroll-bar-mode set-scroll-bar-mode) + (define-minor-mode scroll-bar-mode - "Toggle display of vertical scroll bars on all frames. + "Toggle vertical scroll bars on all frames (Scroll Bar mode). +With a prefix argument ARG, enable Scroll Bar mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + This command applies to all frames that exist and frames to be -created in the future. -With a numeric argument, if the argument is positive -turn on scroll bars; otherwise turn off scroll bars." +created in the future." :variable (eq (get-scroll-bar-mode) (or previous-scroll-bar-mode default-frame-scroll-bars))) === modified file 'lisp/server.el' --- lisp/server.el 2011-08-28 18:46:38 +0000 +++ lisp/server.el 2011-10-19 12:54:24 +0000 @@ -669,9 +669,13 @@ ;;;###autoload (define-minor-mode server-mode "Toggle Server mode. -With ARG, turn Server mode on if ARG is positive, off otherwise. +With a prefix argument ARG, enable Server mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Server mode if ARG is omitted or nil. + Server mode runs a process that accepts commands from the -`emacsclient' program. See `server-start' and Info node `Emacs server'." +`emacsclient' program. See Info node `Emacs server' and +`server-start' for details." :global t :group 'server :version "22.1" === modified file 'lisp/shell.el' --- lisp/shell.el 2011-10-01 22:05:36 +0000 +++ lisp/shell.el 2011-10-19 12:54:24 +0000 @@ -890,9 +890,13 @@ (defvaralias 'shell-dirtrack-mode 'shell-dirtrackp) (define-minor-mode shell-dirtrack-mode - "Turn directory tracking on and off in a shell buffer. -The `dirtrack' package provides an alternative implementation of this -feature - see the function `dirtrack-mode'." + "Toggle directory tracking in this shell buffer (Shell Dirtrack mode). +With a prefix argument ARG, enable Shell Dirtrack mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +The `dirtrack' package provides an alternative implementation of +this feature; see the function `dirtrack-mode'." nil nil nil (setq list-buffers-directory (if shell-dirtrack-mode default-directory)) (if shell-dirtrack-mode === modified file 'lisp/simple.el' --- lisp/simple.el 2011-10-13 11:58:54 +0000 +++ lisp/simple.el 2011-10-19 12:54:24 +0000 @@ -4086,13 +4086,15 @@ (define-minor-mode transient-mark-mode "Toggle Transient Mark mode. -With ARG, turn Transient Mark mode on if ARG is positive, off otherwise. +With a prefix argument ARG, enable Transient Mark mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Transient Mark mode if ARG is omitted or nil. -In Transient Mark mode, when the mark is active, the region is highlighted. -Changing the buffer \"deactivates\" the mark. -So do certain other operations that set the mark -but whose main purpose is something else--for example, -incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]. +Transient Mark mode is a global minor mode. When enabled, the +region is highlighted whenever the mark is active. The mark is +\"deactivated\" by changing the buffer, and after certain other +operations that set the mark but whose main purpose is something +else--for example, incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]. You can also deactivate the mark by typing \\[keyboard-quit] or \\[keyboard-escape-quit]. @@ -4906,8 +4908,15 @@ (defvar visual-line--saved-state nil) (define-minor-mode visual-line-mode - "Redefine simple editing commands to act on visual lines, not logical lines. -This also turns on `word-wrap' in the buffer." + "Toggle visual line based editing (Visual Line mode). +With a prefix argument ARG, enable Visual Line mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Visual Line mode is enabled, `word-wrap' is turned on in +this buffer, and simple editing commands are redefined to act on +visual lines, not logical lines. See Info node `Visual Line +Mode' for details." :keymap visual-line-mode-map :group 'visual-line :lighter " Wrap" @@ -5301,10 +5310,14 @@ (put 'auto-fill-function 'safe-local-variable 'null) (define-minor-mode auto-fill-mode - "Toggle Auto Fill mode. -With ARG, turn Auto Fill mode on if and only if ARG is positive. -In Auto Fill mode, inserting a space at a column beyond `current-fill-column' -automatically breaks the line at a previous space. + "Toggle automatic line breaking (Auto Fill mode). +With a prefix argument ARG, enable Auto Fill mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Auto Fill mode is enabled, inserting a space at a column +beyond `current-fill-column' automatically breaks the line at a +previous space. When `auto-fill-mode' is on, the `auto-fill-function' variable is non-`nil'. @@ -5412,36 +5425,44 @@ "The string displayed in the mode line when in binary overwrite mode.") (define-minor-mode overwrite-mode - "Toggle overwrite mode. -With prefix argument ARG, turn overwrite mode on if ARG is positive, -otherwise turn it off. In overwrite mode, printing characters typed -in replace existing text on a one-for-one basis, rather than pushing -it to the right. At the end of a line, such characters extend the line. -Before a tab, such characters insert until the tab is filled in. -\\[quoted-insert] still inserts characters in overwrite mode; this -is supposed to make it easier to insert characters when necessary." + "Toggle Overwrite mode. +With a prefix argument ARG, enable Overwrite mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Overwrite mode is enabled, printing characters typed in +replace existing text on a one-for-one basis, rather than pushing +it to the right. At the end of a line, such characters extend +the line. Before a tab, such characters insert until the tab is +filled in. \\[quoted-insert] still inserts characters in +overwrite mode; this is supposed to make it easier to insert +characters when necessary." :variable (eq overwrite-mode 'overwrite-mode-textual)) (define-minor-mode binary-overwrite-mode - "Toggle binary overwrite mode. -With prefix argument ARG, turn binary overwrite mode on if ARG is -positive, otherwise turn it off. In binary overwrite mode, printing -characters typed in replace existing text. Newlines are not treated -specially, so typing at the end of a line joins the line to the next, -with the typed character between them. Typing before a tab character -simply replaces the tab with the character typed. \\[quoted-insert] -replaces the text at the cursor, just as ordinary typing characters do. - -Note that binary overwrite mode is not its own minor mode; it is a -specialization of overwrite mode, entered by setting the + "Toggle Binary Overwrite mode. +With a prefix argument ARG, enable Binary Overwrite mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +When Binary Overwrite mode is enabled, printing characters typed +in replace existing text. Newlines are not treated specially, so +typing at the end of a line joins the line to the next, with the +typed character between them. Typing before a tab character +simply replaces the tab with the character typed. +\\[quoted-insert] replaces the text at the cursor, just as +ordinary typing characters do. + +Note that Binary Overwrite mode is not its own minor mode; it is +a specialization of overwrite mode, entered by setting the `overwrite-mode' variable to `overwrite-mode-binary'." :variable (eq overwrite-mode 'overwrite-mode-binary)) (define-minor-mode line-number-mode - "Toggle Line Number mode. -With ARG, turn Line Number mode on if ARG is positive, otherwise -turn it off. When Line Number mode is enabled, the line number -appears in the mode line. + "Toggle line number display in the mode line (Line Number mode). +With a prefix argument ARG, enable Line Number mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. Line numbers do not appear for very large buffers and buffers with very long lines; see variables `line-number-display-limit' @@ -5449,22 +5470,27 @@ :init-value t :global t :group 'mode-line) (define-minor-mode column-number-mode - "Toggle Column Number mode. -With ARG, turn Column Number mode on if ARG is positive, -otherwise turn it off. When Column Number mode is enabled, the -column number appears in the mode line." + "Toggle column number display in the mode line (Column Number mode). +With a prefix argument ARG, enable Column Number mode if ARG is +positive, and disable it otherwise. + +If called from Lisp, enable the mode if ARG is omitted or nil." :global t :group 'mode-line) (define-minor-mode size-indication-mode - "Toggle Size Indication mode. -With ARG, turn Size Indication mode on if ARG is positive, -otherwise turn it off. When Size Indication mode is enabled, the -size of the accessible part of the buffer appears in the mode line." + "Toggle buffer size display in the mode line (Size Indication mode). +With a prefix argument ARG, enable Size Indication mode if ARG is +positive, and disable it otherwise. + +If called from Lisp, enable the mode if ARG is omitted or nil." :global t :group 'mode-line) (define-minor-mode auto-save-mode - "Toggle auto-saving of contents of current buffer. -With prefix argument ARG, turn auto-saving on if positive, else off." + "Toggle auto-saving in the current buffer (Auto Save mode). +With a prefix argument ARG, enable Auto Save mode if ARG is +positive, and disable it otherwise. + +If called from Lisp, enable the mode if ARG is omitted or nil." :variable ((and buffer-auto-save-file-name ;; If auto-save is off because buffer has shrunk, ;; then toggling should turn it on. @@ -6634,8 +6660,9 @@ (define-minor-mode normal-erase-is-backspace-mode "Toggle the Erase and Delete mode of the Backspace and Delete keys. - -With numeric ARG, turn the mode on if and only if ARG is positive. +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. On window systems, when this mode is on, Delete is mapped to C-d and Backspace is mapped to DEL; when this mode is off, both @@ -6709,13 +6736,13 @@ "Saved value of `buffer-invisibility-spec' when Visible mode is on.") (define-minor-mode visible-mode - "Toggle Visible mode. -With argument ARG turn Visible mode on if ARG is positive, otherwise -turn it off. + "Toggle making all invisible text temporarily visible (Visible mode). +With a prefix argument ARG, enable Visible mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -Enabling Visible mode makes all invisible text temporarily visible. -Disabling Visible mode turns off that effect. Visible mode works by -saving the value of `buffer-invisibility-spec' and setting it to nil." +This mode works by saving the value of `buffer-invisibility-spec' +and setting it to nil." :lighter " Vis" :group 'editing-basics (when (local-variable-p 'vis-mode-saved-buffer-invisibility-spec) === modified file 'lisp/strokes.el' --- lisp/strokes.el 2011-04-19 13:44:55 +0000 +++ lisp/strokes.el 2011-10-19 12:54:24 +0000 @@ -1386,8 +1386,12 @@ ;;;###autoload (define-minor-mode strokes-mode - "Toggle Strokes global minor mode.\\ -With ARG, turn strokes on if and only if ARG is positive. + "Toggle Strokes mode, a global minor mode. +With a prefix argument ARG, enable Strokes mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +\\ Strokes are pictographic mouse gestures which invoke commands. Strokes are invoked with \\[strokes-do-stroke]. You can define new strokes with \\[strokes-global-set-stroke]. See also === modified file 'lisp/t-mouse.el' --- lisp/t-mouse.el 2011-01-26 08:36:39 +0000 +++ lisp/t-mouse.el 2011-10-19 12:54:24 +0000 @@ -33,7 +33,7 @@ ;; mev. Now the interface with gpm is directly through a Unix socket, so this ;; file is reduced to a single minor mode macro call. -;; +;; ;;; Code: @@ -65,9 +65,10 @@ (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") ;;;###autoload (define-minor-mode gpm-mouse-mode - "Toggle gpm-mouse mode to use the mouse in GNU/Linux consoles. -With prefix arg, turn gpm-mouse mode on if arg is positive, -otherwise turn it off. + "Toggle mouse support in GNU/Linux consoles (GPM Mouse mode). +With a prefix argument ARG, enable GPM Mouse mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. This allows the use of the mouse when operating on a GNU/Linux console, in the same way as you can use the mouse under X11. === modified file 'lisp/time.el' --- lisp/time.el 2011-08-08 15:53:35 +0000 +++ lisp/time.el 2011-10-19 12:54:24 +0000 @@ -484,14 +484,15 @@ ;;;###autoload (define-minor-mode display-time-mode "Toggle display of time, load level, and mail flag in mode lines. -With a numeric arg, enable this display if arg is positive. +With a prefix argument ARG, enable Display Time mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +it if ARG is omitted or nil. -When this display is enabled, it updates automatically every minute -\(you can control the number of seconds between updates by -customizing `display-time-interval'). -If `display-time-day-and-date' is non-nil, the current day and date -are displayed as well. -This runs the normal hook `display-time-hook' after each update." +When Display Time mode is enabled, it updates every minute (you +can control the number of seconds between updates by customizing +`display-time-interval'). If `display-time-day-and-date' is +non-nil, the current day and date are displayed as well. This +runs the normal hook `display-time-hook' after each update." :global t :group 'display-time (and display-time-timer (cancel-timer display-time-timer)) (setq display-time-timer nil) === modified file 'lisp/tool-bar.el' --- lisp/tool-bar.el 2011-07-10 14:09:05 +0000 +++ lisp/tool-bar.el 2011-10-19 12:54:24 +0000 @@ -43,9 +43,10 @@ ;; Deleting it means invoking this command won't work ;; when you are on a tty. I hope that won't cause too much trouble -- rms. (define-minor-mode tool-bar-mode - "Toggle use of the tool bar. -With a numeric argument, if the argument is positive, turn on the -tool bar; otherwise, turn off the tool bar. + "Toggle the tool bar in all graphical frames (Tool Bar mode). +With a prefix argument ARG, enable Tool Bar mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Tool Bar mode if ARG is omitted or nil. See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for conveniently adding tool bar items." === modified file 'lisp/tooltip.el' --- lisp/tooltip.el 2011-04-19 13:44:55 +0000 +++ lisp/tooltip.el 2011-10-19 12:54:24 +0000 @@ -39,11 +39,14 @@ ;;; Switching tooltips on/off (define-minor-mode tooltip-mode - "Toggle Tooltip mode. -With ARG, turn Tooltip mode on if and only if ARG is positive. -When this minor mode is enabled, Emacs displays help text -in a pop-up window for buttons and menu items that you put the mouse on. -\(However, if `tooltip-use-echo-area' is non-nil, this and + "Toggle use of graphical tooltips (Tooltip mode). +With a prefix argument ARG, enable Tooltip mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +it if ARG is omitted or nil. + +When Tooltip mode is enabled, Emacs displays help text in a +pop-up window for buttons and menu items that you put the mouse +on. \(However, if `tooltip-use-echo-area' is non-nil, this and all pop-up help appears in the echo area.) When Tooltip mode is disabled, Emacs displays one line of === modified file 'lisp/type-break.el' --- lisp/type-break.el 2011-07-04 01:06:33 +0000 +++ lisp/type-break.el 2011-10-19 12:54:24 +0000 @@ -431,13 +431,13 @@ type-break-mode) (define-minor-mode type-break-mode-line-message-mode - "Enable or disable warnings in the mode line about typing breaks. - -A negative PREFIX argument disables this mode. -No argument or any non-negative argument enables it. - -The user may also enable or disable this mode simply by setting the -variable of the same name. + "Toggle warnings about typing breaks in the mode line. +With a prefix argument ARG, enable these warnings if ARG is +positive, and disable them otherwise. If called from Lisp, +enable them if ARG is omitted or nil. + +The user may also enable or disable this mode simply by setting +the variable of the same name. Variables controlling the display of messages in the mode line include: @@ -448,17 +448,13 @@ :global t) (define-minor-mode type-break-query-mode - "Enable or disable warnings in the mode line about typing breaks. - -When enabled, the user is periodically queried about whether to take a -typing break at that moment. The function which does this query is -specified by the variable `type-break-query-function'. - -A negative PREFIX argument disables this mode. -No argument or any non-negative argument enables it. - -The user may also enable or disable this mode simply by setting the -variable of the same name." + "Toggle typing break queries. +With a prefix argument ARG, enable these queries if ARG is +positive, and disable them otherwise. If called from Lisp, +enable them if ARG is omitted or nil. + +The user may also enable or disable this mode simply by setting +the variable of the same name." :global t) === modified file 'lisp/view.el' --- lisp/view.el 2011-09-02 16:38:40 +0000 +++ lisp/view.el 2011-10-19 12:54:24 +0000 @@ -369,19 +369,24 @@ ;; bindings instead of using the \\[] construction. The reason for this ;; is that most commands have more than one key binding. "Toggle View mode, a minor mode for viewing text but not editing it. -With prefix argument ARG, turn View mode on if ARG is positive, otherwise -turn it off. - -Emacs commands that do not change the buffer contents are available as usual. -Kill commands insert text in kill buffers but do not delete. Other commands -\(among them most letters and punctuation) beep and tell that the buffer is -read-only. +With a prefix argument ARG, enable View mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable View mode +if ARG is omitted or nil. + +When View mode is enabled, commands that do not change the buffer +contents are available as usual. Kill commands insert text in +kill buffers but do not delete. Most other commands beep and +tell the user that the buffer is read-only. + \\ -The following additional commands are provided. Most commands take prefix -arguments. Page commands default to \"page size\" lines which is almost a whole -window full, or number of lines set by \\[View-scroll-page-forward-set-page-size] or \\[View-scroll-page-backward-set-page-size]. Half page commands default to -and set \"half page size\" lines which initially is half a window full. Search -commands default to a repeat count of one. + +The following additional commands are provided. Most commands +take prefix arguments. Page commands default to \"page size\" +lines which is almost a whole window, or number of lines set by +\\[View-scroll-page-forward-set-page-size] or \\[View-scroll-page-backward-set-page-size]. +Half page commands default to and set \"half page size\" lines +which initially is half a window full. Search commands default +to a repeat count of one. H, h, ? This message. Digits provide prefix arguments. === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2011-09-19 18:06:14 +0000 +++ lisp/whitespace.el 2011-10-19 12:54:24 +0000 @@ -1064,11 +1064,10 @@ ;;;###autoload (define-minor-mode whitespace-mode - "Toggle whitespace minor mode visualization (\"ws\" on modeline). - -If ARG is null, toggle whitespace visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. + "Toggle whitespace visualization (Whitespace mode). +With a prefix argument ARG, enable Whitespace mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. See also `whitespace-style', `whitespace-newline' and `whitespace-display-mappings'." @@ -1088,11 +1087,10 @@ ;;;###autoload (define-minor-mode whitespace-newline-mode - "Toggle NEWLINE minor mode visualization (\"nl\" on modeline). - -If ARG is null, toggle NEWLINE visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. + "Toggle newline visualization (Whitespace Newline mode). +With a prefix argument ARG, enable Whitespace Newline mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. Use `whitespace-newline-mode' only for NEWLINE visualization exclusively. For other visualizations, including NEWLINE @@ -1116,11 +1114,10 @@ ;;;###autoload (define-minor-mode global-whitespace-mode - "Toggle whitespace global minor mode visualization (\"WS\" on modeline). - -If ARG is null, toggle whitespace visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. + "Toggle whitespace visualization globally (Global Whitespace mode). +With a prefix argument ARG, enable Global Whitespace mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable it if ARG is omitted or nil. See also `whitespace-style', `whitespace-newline' and `whitespace-display-mappings'." @@ -1174,11 +1171,10 @@ ;;;###autoload (define-minor-mode global-whitespace-newline-mode - "Toggle NEWLINE global minor mode visualization (\"NL\" on modeline). - -If ARG is null, toggle NEWLINE visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. + "Toggle global newline visualization (Global Whitespace Newline mode). +With a prefix argument ARG, enable Global Whitespace Newline mode +if ARG is positive, and disable it otherwise. If called from +Lisp, enable it if ARG is omitted or nil. Use `global-whitespace-newline-mode' only for NEWLINE visualization exclusively. For other visualizations, including === modified file 'lisp/wid-browse.el' --- lisp/wid-browse.el 2011-04-19 13:44:55 +0000 +++ lisp/wid-browse.el 2011-10-19 12:54:24 +0000 @@ -270,8 +270,7 @@ ;;;###autoload (define-minor-mode widget-minor-mode - "Togle minor mode for traversing widgets. -With arg, turn widget mode on if and only if arg is positive." + "Minor mode for traversing widgets." :lighter " Widget") ;;; The End: === modified file 'lisp/xt-mouse.el' --- lisp/xt-mouse.el 2011-08-09 22:13:11 +0000 +++ lisp/xt-mouse.el 2011-10-19 12:54:24 +0000 @@ -199,8 +199,9 @@ ;;;###autoload (define-minor-mode xterm-mouse-mode "Toggle XTerm mouse mode. -With prefix arg, turn XTerm mouse mode on if arg is positive, otherwise turn -it off. +With a prefix argument ARG, enable XTerm mouse mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. Turn it on to use Emacs mouse commands, and off to use xterm mouse commands. This works in terminal emulators compatible with xterm. It only