commit 43255732987afe72427816a6899ab58159e56638 (HEAD, refs/remotes/origin/master) Author: Tino Calancha Date: Sun Nov 20 15:38:11 2016 +0900 * src/editfns.c (format-time-string): Mention %q in doc string. diff --git a/src/editfns.c b/src/editfns.c index 70c5383..72c7a9c 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -2038,6 +2038,7 @@ by text that describes the specified date and time in TIME: %H is the hour on a 24-hour clock, %I is on a 12-hour clock, %k is like %H only blank-padded, %l is like %I blank-padded. %p is the locale's equivalent of either AM or PM. +%q is the calendar quarter (1–4). %M is the minute. %S is the second. %N is the nanosecond, %6N the microsecond, %3N the millisecond, etc. commit b81bb485eaaa42f93f36988b8b17576f489b988d Author: Paul Eggert Date: Sat Nov 19 16:15:29 2016 -0800 Document format-time-string %q * doc/lispref/os.texi (Time Parsing): * etc/NEWS: Document new %q functionality taken from gnulib. diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 616d1e7..3b649d2 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1525,6 +1525,8 @@ fewer digits, use @samp{%3N} for milliseconds, @samp{%6N} for microseconds, etc. Any excess digits are discarded, without rounding. @item %p This stands for @samp{AM} or @samp{PM}, as appropriate. +@item %q +This stands for the calendar quarter (1--4). @item %r This is a synonym for @samp{%I:%M:%S %p}. @item %R diff --git a/etc/NEWS b/etc/NEWS index bd83c60..21cda7c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -689,6 +689,9 @@ ABBR is a time zone abbreviation. The affected functions are 'current-time-string', 'current-time-zone', 'decode-time', 'format-time-string', and 'set-time-zone-rule'. ++++ +** 'format-time-string' now formats "%q" to the calendar quarter. + ** New built-in function 'mapcan' which avoids unnecessary consing (and garbage collection). commit bbd84f86bce9c04ae08d9bccbad19c48e74f3f8b Author: Paul Eggert Date: Sat Nov 19 16:00:57 2016 -0800 Merge from gnulib This incorporates: 2016-11-15 sys_time: add gnulib::timeval for C++ 2016-11-14 snippet/c++defs: fix real-floating arg functions in C++ mode 2016-11-13 strftime: don't use __THROW 2016-11-12 strftime: tune %q 2016-11-12 Merge strftime.c changes from glibc 2016-11-09 manywarnings: fix -Wno-missing-field-initializers detection 2016-11-05 strftime,strptime: support %q to represent the quarter The glibc changes in turn incorporate the following strftime.c changes: 2015-10-20 Convert misc function definitions to prototype style 2015-09-26 [BZ #18985] out of range data to strftime() causes segfault 2010-01-09 Add support for XPG7 testing 2009-10-30 Implement Burmese language locale for Myanmar 2008-06-13 [BZ #6612] pass reference to tzset_called around 2007-10-16 [BZ #5184] Add tzset_called argument * build-aux/snippet/c++defs.h, lib/strftime.c, lib/sys_time.in.h: * m4/manywarnings.m4: Copy from gnulib. diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h index 813f2e2..d42ea25 100644 --- a/build-aux/snippet/c++defs.h +++ b/build-aux/snippet/c++defs.h @@ -17,6 +17,15 @@ #ifndef _GL_CXXDEFS_H #define _GL_CXXDEFS_H +/* Begin/end the GNULIB_NAMESPACE namespace. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { +# define _GL_END_NAMESPACE } +#else +# define _GL_BEGIN_NAMESPACE +# define _GL_END_NAMESPACE +#endif + /* The three most frequent use cases of these macros are: * For providing a substitute for a function that is missing on some @@ -111,14 +120,22 @@ that redirects to rpl_func, if GNULIB_NAMESPACE is defined. Example: _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); - */ + + Wrapping rpl_func in an object with an inline conversion operator + avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is + actually used in the program. */ #define _GL_CXXALIAS_RPL(func,rettype,parameters) \ _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) #if defined __cplusplus && defined GNULIB_NAMESPACE # define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ namespace GNULIB_NAMESPACE \ { \ - rettype (*const func) parameters = ::rpl_func; \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + inline type rpl () const { return ::rpl_func; } \ + inline operator type () const { return rpl (); } \ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else @@ -135,8 +152,13 @@ # define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ namespace GNULIB_NAMESPACE \ { \ - rettype (*const func) parameters = \ - reinterpret_cast(::rpl_func); \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + inline type rpl () const \ + { return reinterpret_cast(::rpl_func); } \ + inline operator type () const { return rpl (); } \ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else @@ -150,18 +172,20 @@ is defined. Example: _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); - */ + + Wrapping func in an object with an inline conversion operator + avoids a reference to func unless GNULIB_NAMESPACE::func is + actually used in the program. */ #if defined __cplusplus && defined GNULIB_NAMESPACE - /* If we were to write - rettype (*const func) parameters = ::func; - like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls - better (remove an indirection through a 'static' pointer variable), - but then the _GL_CXXALIASWARN macro below would cause a warning not only - for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ -# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static rettype (*func) parameters = ::func; \ +# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + inline type rpl () const { return ::func; } \ + inline operator type () const { return rpl (); } \ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else @@ -178,8 +202,13 @@ # define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ namespace GNULIB_NAMESPACE \ { \ - static rettype (*func) parameters = \ - reinterpret_cast(::func); \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + inline type rpl () const \ + { return reinterpret_cast(::func); } \ + inline operator type () const { return rpl (); }\ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else @@ -202,9 +231,15 @@ # define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ namespace GNULIB_NAMESPACE \ { \ - static rettype (*func) parameters = \ - reinterpret_cast( \ - (rettype2(*)parameters2)(::func)); \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline type rpl () const \ + { return reinterpret_cast((rettype2 (*) parameters2)(::func)); }\ + \ + inline operator type () const { return rpl (); } \ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else diff --git a/lib/strftime.c b/lib/strftime.c index 4e65190..2e01083 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -1,22 +1,22 @@ -/* Copyright (C) 1991-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@prep.ai.mit.edu. + The GNU C Library 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. - This program 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. - - This program is distributed in the hope that it will be useful, + The GNU C Library 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. + 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 this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + . */ #ifdef _LIBC +# define USE_IN_EXTENDED_LOCALE_MODEL 1 # define HAVE_STRUCT_ERA_ENTRY 1 # define HAVE_TM_GMTOFF 1 # define HAVE_TM_ZONE 1 @@ -63,10 +63,10 @@ extern char *tzname[]; #endif #include -#include #include #include #include +#include #ifdef COMPILE_WIDE # include @@ -247,11 +247,11 @@ extern char *tzname[]; # undef _NL_CURRENT # define _NL_CURRENT(category, item) \ (current->values[_NL_ITEM_INDEX (item)].string) +# define LOCALE_PARAM , __locale_t loc # define LOCALE_ARG , loc -# define LOCALE_PARAM_PROTO , __locale_t loc # define HELPER_LOCALE_ARG , current #else -# define LOCALE_PARAM_PROTO +# define LOCALE_PARAM # define LOCALE_ARG # ifdef _LIBC # define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME) @@ -304,18 +304,22 @@ fwrite_uppcase (FILE *fp, const CHAR_T *src, size_t len) } } #else +static CHAR_T *memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM); + static CHAR_T * -memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, - size_t len LOCALE_PARAM_PROTO) +memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM) { while (len-- > 0) dest[len] = TOLOWER ((UCHAR_T) src[len], loc); return dest; } +static CHAR_T *memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM); + static CHAR_T * -memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, - size_t len LOCALE_PARAM_PROTO) +memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM) { while (len-- > 0) dest[len] = TOUPPER ((UCHAR_T) src[len], loc); @@ -328,6 +332,7 @@ memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, /* Yield the difference between *A and *B, measured in seconds, ignoring leap seconds. */ # define tm_diff ftime_tm_diff +static int tm_diff (const struct tm *, const struct tm *); static int tm_diff (const struct tm *a, const struct tm *b) { @@ -359,6 +364,7 @@ tm_diff (const struct tm *a, const struct tm *b) #define ISO_WEEK_START_WDAY 1 /* Monday */ #define ISO_WEEK1_WDAY 4 /* Thursday */ #define YDAY_MINIMUM (-366) +static int iso_week_days (int, int); #ifdef __GNUC__ __inline__ #endif @@ -401,17 +407,41 @@ iso_week_days (int yday, int wday) # define ns 0 #endif +static size_t __strftime_internal (STREAM_OR_CHAR_T *, STRFTIME_ARG (size_t) + const CHAR_T *, const struct tm *, + bool, bool * + extra_args_spec LOCALE_PARAM); -/* Just like my_strftime, below, but with one more parameter, UPCASE, - to indicate that the result should be converted to upper case. */ +/* Write information from TP into S according to the format + string FORMAT, writing no more that MAXSIZE characters + (including the terminating '\0') and returning number of + characters written. If S is NULL, nothing will be written + anywhere, so to determine how many characters would be + written, use NULL for S and (size_t) -1 for MAXSIZE. */ +size_t +my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) + const CHAR_T *format, + const struct tm *tp extra_args_spec LOCALE_PARAM) +{ + bool tzset_called = false; + return __strftime_internal (s, STRFTIME_ARG (maxsize) format, tp, + false, &tzset_called extra_args LOCALE_ARG); +} +#if defined _LIBC && ! FPRINTFTIME +libc_hidden_def (my_strftime) +#endif + +/* Just like my_strftime, above, but with two more parameters. + UPCASE indicate that the result should be converted to upper case, + and *TZSET_CALLED indicates whether tzset has been called here. */ static size_t -strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, - STRFTIME_ARG (size_t maxsize) - const CHAR_T *format, - const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO) +__strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) + const CHAR_T *format, + const struct tm *tp, bool upcase, bool *tzset_called + extra_args_spec LOCALE_PARAM) { #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL - struct locale_data *const current = loc->__locales[LC_TIME]; + struct __locale_data *const current = loc->__locales[LC_TIME]; #endif #if FPRINTFTIME size_t maxsize = (size_t) -1; @@ -426,13 +456,17 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, only a few elements. Dereference the pointers only if the format requires this. Then it is ok to fail if the pointers are invalid. */ # define a_wkday \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday)) + ((const CHAR_T *) (tp->tm_wday < 0 || tp->tm_wday > 6 \ + ? "?" : _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday))) # define f_wkday \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday)) + ((const CHAR_T *) (tp->tm_wday < 0 || tp->tm_wday > 6 \ + ? "?" : _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday))) # define a_month \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon)) + ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \ + ? "?" : _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon))) # define f_month \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)) + ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \ + ? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon))) # define ampm \ ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \ ? NLW(PM_STR) : NLW(AM_STR))) @@ -483,15 +517,21 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, /* Infer the zone name from *TZ instead of from TZNAME. */ tzname_vec = tz->tzname_copy; # endif + } + /* The tzset() call might have changed the value. */ + if (!(zone && *zone) && tp->tm_isdst >= 0) + { /* POSIX.1 requires that local time zone information be used as though strftime called tzset. */ # if HAVE_TZSET - tzset (); + if (!*tzset_called) + { + tzset (); + *tzset_called = true; + } # endif + zone = tzname_vec[tp->tm_isdst != 0]; } - /* The tzset() call might have changed the value. */ - if (!(zone && *zone) && tp->tm_isdst >= 0) - zone = tzname_vec[tp->tm_isdst != 0]; #endif if (! zone) zone = ""; @@ -801,14 +841,15 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, subformat: { - size_t len = strftime_case_ (to_uppcase, - NULL, STRFTIME_ARG ((size_t) -1) - subfmt, - tp extra_args LOCALE_ARG); - add (len, strftime_case_ (to_uppcase, p, - STRFTIME_ARG (maxsize - i) - subfmt, - tp extra_args LOCALE_ARG)); + size_t len = __strftime_internal (NULL, STRFTIME_ARG ((size_t) -1) + subfmt, + tp, to_uppcase, tzset_called + extra_args LOCALE_ARG); + add (len, __strftime_internal (p, + STRFTIME_ARG (maxsize - i) + subfmt, + tp, to_uppcase, tzset_called + extra_args LOCALE_ARG)); } break; @@ -845,8 +886,6 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, #endif case L_('C'): - if (modifier == L_('O')) - goto bad_format; if (modifier == L_('E')) { #if HAVE_STRUCT_ERA_ENTRY @@ -1115,6 +1154,10 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, goto underlying_strftime; #endif + case L_('q'): /* GNU extension. */ + DO_SIGNED_NUMBER (1, false, ((tp->tm_mon * 11) >> 5) + 1); + break; + case L_('R'): subfmt = L_("%H:%M"); goto subformat; @@ -1364,6 +1407,16 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, struct tm ltm; time_t lt; + /* POSIX.1 requires that local time zone information be used as + though strftime called tzset. */ +# if HAVE_TZSET + if (!*tzset_called) + { + tzset (); + *tzset_called = true; + } +# endif + ltm = *tp; lt = mktime_z (tz, <m); @@ -1444,22 +1497,3 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, return i; } - -/* Write information from TP into S according to the format - string FORMAT, writing no more that MAXSIZE characters - (including the terminating '\0') and returning number of - characters written. If S is NULL, nothing will be written - anywhere, so to determine how many characters would be - written, use NULL for S and (size_t) -1 for MAXSIZE. */ -size_t -my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) - const CHAR_T *format, - const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO) -{ - return strftime_case_ (false, s, STRFTIME_ARG (maxsize) - format, tp extra_args LOCALE_ARG); -} - -#if defined _LIBC && ! FPRINTFTIME -libc_hidden_def (my_strftime) -#endif diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 1623a1d..d535a6a 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -109,6 +109,13 @@ _GL_CXXALIAS_SYS_CAST (gettimeofday, int, (struct timeval *restrict, void *restrict)); # endif _GL_CXXALIASWARN (gettimeofday); +# if defined __cplusplus && defined GNULIB_NAMESPACE +namespace GNULIB_NAMESPACE { + typedef ::timeval +#undef timeval + timeval; +} +# endif #elif defined GNULIB_POSIXCHECK # undef gettimeofday # if HAVE_RAW_DECL_GETTIMEOFDAY diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index 89fd0ae..4f701f4 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -62,10 +62,11 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], CFLAGS="$CFLAGS -W -Werror" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[void f (void) + [[int f (void) { typedef struct { int a; int b; } s_t; s_t s1 = { 0, }; + return s1.b; } ]], [[]])], commit 493a8f33ba916403d1fab620e08146632b826101 Author: Paul Eggert Date: Sat Nov 19 14:57:40 2016 -0800 ; Spelling fixes diff --git a/etc/NEWS b/etc/NEWS index 403f7f7..bd83c60 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -556,7 +556,7 @@ variable. eval-current-buffer, string-to-int *** All the default-FOO variables that hold the default value of the FOO variable. Use 'default-value' and 'setq-default' to access and -change FOO, repectively. The exhaustive list of removed variables is: +change FOO, respectively. The exhaustive list of removed variables is: 'default-mode-line-format', 'default-header-line-format', 'default-line-spacing', 'default-abbrev-mode', 'default-ctl-arrow', 'default-truncate-lines', 'default-left-margin', 'default-tab-width', diff --git a/etc/PROBLEMS b/etc/PROBLEMS index bbf865c..c9b11fbc5 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2423,8 +2423,8 @@ If you do, please send it to bug-gnu-emacs@gnu.org so we can list it here. The implementation of that function on Mac OS X uses pathconf with the _PC_CASE_SENSITIVE flag. There have been reports that this use of pathconf does not work reliably. If you have a problem, please -recompile Emacs with -DDARWIN_OS_CASE_SENSITIVE_FIXME=1 or --DDARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying +recompile Emacs with -D DARWIN_OS_CASE_SENSITIVE_FIXME=1 or +-D DARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying whether this fixed your problem. * Build-time problems diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 60199d2..abe8de3 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2920,7 +2920,7 @@ User is always nil." (setq candidate (directory-file-name (file-name-directory candidate)))) ;; Nothing found, so we must use a temporary file for - ;; comparision. `make-nearby-temp-file' is added to + ;; comparison. `make-nearby-temp-file' is added to ;; Emacs 26+ like `file-name-case-insensitive-p', so ;; there is no compatibility problem calling it. (unless diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 5f07cbb..5368b61 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -9435,7 +9435,7 @@ you can read them automatically with: // verilog-auto-read-includes:t // End: -Or a more specific alternative example, which requires haing +Or a more specific alternative example, which requires having `enable-local-eval' non-nil: // Local Variables: diff --git a/src/fileio.c b/src/fileio.c index 66a4873..7aa5817 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2259,8 +2259,8 @@ file_name_case_insensitive_p (const char *filename) There have been reports that pathconf with _PC_CASE_SENSITIVE does not work reliably on Mac OS X. If you have a problem, - please recompile Emacs with -DDARWIN_OS_CASE_SENSITIVE_FIXME=1 or - -DDARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying + please recompile Emacs with -D DARWIN_OS_CASE_SENSITIVE_FIXME=1 or + -D DARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying whether this fixed your problem. */ #ifdef _PC_CASE_INSENSITIVE diff --git a/src/process.c b/src/process.c index d68c930..49340b1 100644 --- a/src/process.c +++ b/src/process.c @@ -3102,7 +3102,7 @@ finish_after_tls_connection (Lisp_Object proc) else if (p->outfd < 0) { /* The counterparty may have closed the connection (especially - if the NSM promt above take a long time), so recheck the file + if the NSM prompt above take a long time), so recheck the file descriptor here. */ pset_status (p, Qfailed); deactivate_process (proc); commit 870c56a0bd8fe51baa2efa20a75b848f2bd27fd4 Merge: 6a03b47 07f45d7 Author: Paul Eggert Date: Sat Nov 19 14:43:25 2016 -0800 Merge from origin/emacs-25 07f45d7 ; Spelling fix 1a210f0 * admin/release-process: Update versions and blocking bug num... 36bafc9 Improve documentation of functions that accept time values # Conflicts: # admin/release-process # src/editfns.c commit 6a03b47f81c5a8f44d7bc524fce93d6f63dc4d08 Merge: c61ee94 a37c08d Author: Paul Eggert Date: Sat Nov 19 14:31:06 2016 -0800 ; Merge from origin/emacs-25 The following commit was skipped: a37c08d Speed up initialization by preferring /dev/urandom to GnuTLS commit c61ee94959ba96b2a327df0684593f7e569e30be Merge: b19e05b 4af5981 Author: Paul Eggert Date: Sat Nov 19 14:31:05 2016 -0800 Merge from origin/emacs-25 4af5981 Add a comment in generated refcards about the source ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment. 4887e7c js-mode: Fix indent problem after a regexp e992ac0 Fix sluggish display of symbols in UTF-8 language environment 1fc101b Don't confuse how Texinfo outputs @var with the input 91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame... f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da... 5b0cddd More fixes in copyright notices in etc/refcards/ f994c20 Update copyright text in refcards 9ad2ae7 Fix Outline command names 26c3554 Send text received by bracketed paste to process db0b58d Correct the statement about programming modes always running ... 78aece4 Improve documentation of 'occur' eb364fd Do call debugger on failed cl-assert 3ef4ee8 Avoid infloop in python 8da810f Don't refer to obsolete FEATURE-unload-hook 4f478ca Improve documentation of dabbrevs 7272e5d * lisp/chistory.el (list-command-history): Doc fix. (Bug#24890) 89b7482 * lisp/simple.el (set-mark-command): Doc fix. (Bug#24890) 3b199f7 Improve documentation of some Help commands 93d3a0e Fix documentation of yes-or-no prompts af04919 Fix documentation of partial completion style ed80184 Fix documentation of the mode line on emacsclient frames e6be855 Fix description of 'C-z' in User manual 16f7007 Improve and clarify documentation of Outline Mode 31d93aa Add Emacs version number to nt/README.W32 0b6b815 Fix python-mode hideshow regexp dc152c5 Modernize usage of 'macOS' in doc and comments 84c5343 Prefer comments /* like this */ in C code bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845). 3ef86fd Clarify documentation of face attribute functions de51d59 ; * nt/README.W32: Minor copyedits. db436e9 Don't call debug on failed cl-assert # Conflicts: # doc/emacs/cmdargs.texi # etc/NEWS # etc/PROBLEMS # lisp/auth-source.el # lisp/net/tramp-sh.el commit 07f45d77816c947d90e1c56d489a6b32bdacdda0 Author: Paul Eggert Date: Sat Nov 19 14:11:08 2016 -0800 ; Spelling fix diff --git a/nt/README.W32 b/nt/README.W32 index b65a1de..9bc8f87 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -283,7 +283,7 @@ See the end of the file for license conditions. To ask questions on this mailing list, send email to help-gnu-emacs@gnu.org. - A mailing list for issuesspecifically related to the MS-Windows port + A mailing list for issues specifically related to the MS-Windows port of Emacs is here: http://lists.gnu.org/mailman/listinfo/help-emacs-windows commit b19e05b13192f72991b65b4b352e09c807fd581c Author: Mark Oteiza Date: Sat Nov 19 13:34:24 2016 -0500 Port RefTeX to cl-lib * lisp/textmodes/reftex-auc.el: * lisp/textmodes/reftex-cite.el: Use cl-lib. (reftex-do-citation, reftex-create-bibtex-file): Substitute cl-lib macros. * lisp/textmodes/reftex-dcr.el: Use cl-lib. (reftex-view-regexp-match): Substitute cl-lib macro. * lisp/textmodes/reftex-global.el: Use cl-lib. (reftex-find-duplicate-labels, reftex-renumber-simple-labels): (reftex-translate): Substitute cl-lib macros. * lisp/textmodes/reftex-index.el: Use cl-lib. (reftex-index, reftex-index-select-tag, reftex-index-mode-map): (reftex-index-next-phrase, reftex-index-phrases-info): (reftex-query-index-phrase): Substitute cl-lib macros. * lisp/textmodes/reftex-parse.el: Use cl-lib. (reftex-parse-from-file, reftex-where-am-I, reftex-what-macro): (reftex-nth-arg, reftex-init-section-numbers, reftex-section-number): Substitute cl-lib macros. * lisp/textmodes/reftex-ref.el: Use cl-lib. (reftex-uniquify-label, reftex-offer-label-menu): Substitute cl-lib macros. * lisp/textmodes/reftex-sel.el: Use cl-lib. (reftex-select-shared-map): Set keymap parent to special-mode-map. Flatten loop and remove digits and hyphen definitions from the map. (reftex-select-label-mode-map): (reftex-select-bib-mode-map): Use cl-lib macro, and flatten other loop. (reftex-insert-docstruct, reftex-select-unmark): Use cl-lib macros. * lisp/textmodes/reftex-vars.el (reftex-vref-is-default): Use cl-pushnew. * lisp/textmodes/reftex.el: Use cl-lib. (reftex-docstruct-symbol): Use cl-incf. (reftex-ref-style-toggle): Replace add-to-list with append. (reftex-compile-variables): Use cl-lib macros, and functions with compiler macros. cl-first is just an alias. (reftex-parse-args, reftex-scanning-info-available-p): (reftex-select-external-document, reftex-get-file-buffer-force): Use cl-lib macros. (reftex-isearch-minor-mode): Replace add-to-list with append. diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index 505df5d..8efe8a2 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el @@ -24,7 +24,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (require 'reftex) diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el index 20cfedc..fd7915c 100644 --- a/lisp/textmodes/reftex-cite.el +++ b/lisp/textmodes/reftex-cite.el @@ -24,7 +24,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (require 'reftex) @@ -744,7 +744,7 @@ While entering the regexp, completion on knows citation keys is possible. (if (> arg 1) (progn (skip-chars-backward "}") - (decf arg) + (cl-decf arg) (reftex-do-citation arg)) (forward-char 1))) @@ -1210,7 +1210,7 @@ created files in the variables `reftex-create-bibtex-header' or ;; check for crossref entries (let* ((attr-list (reftex-parse-bibtex-entry nil beg end)) (xref-key (cdr (assoc "crossref" attr-list)))) - (if xref-key (pushnew xref-key keys))) + (if xref-key (cl-pushnew xref-key keys))) ;; check for string references (let* ((raw-fields (reftex-parse-bibtex-entry nil beg end t)) (string-fields (reftex-get-string-refs raw-fields))) diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index f1d4d6f..65742f3 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -24,7 +24,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (declare-function bibtex-beginning-of-entry "bibtex" ()) @@ -424,7 +424,7 @@ Calling this function several times find successive citation locations." (if match (progn (put 'reftex-view-regexp-match :props newprop) - (put 'reftex-view-regexp-match :cnt (incf cnt)) + (put 'reftex-view-regexp-match :cnt (cl-incf cnt)) (reftex-highlight 0 (match-beginning highlight-group) (match-end highlight-group)) (add-hook 'pre-command-hook 'reftex-highlight-shall-die) diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index d250051..c8c62a0 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -24,7 +24,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (provide 'reftex-global) (require 'reftex) ;;; @@ -154,7 +154,7 @@ No active TAGS table is required." (while dlist (when (and (car (car dlist)) (cdr (car dlist))) - (incf cnt) + (cl-incf cnt) (insert (mapconcat 'identity (car dlist) "\n ") "\n")) (pop dlist)) (goto-char (point-min)) @@ -223,7 +223,7 @@ one with the `xr' package." (if (assoc label translate-alist) (error "Duplicate label %s" label)) (setq new-label (concat (match-string 1 (car entry)) - (int-to-string (incf (cdr nr-cell))))) + (int-to-string (cl-incf (cdr nr-cell))))) (push (cons label new-label) translate-alist) (or (string= label new-label) (setq changed-sequence t)))) @@ -302,7 +302,7 @@ one with the `xr' package." (error "Abort"))) (reftex-unhighlight 1))) ((and test cell) - (incf n)) + (cl-incf n)) ((and (not test) cell) ;; Replace (goto-char (match-beginning 1)) diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index 3cea589..4dd190d 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -24,7 +24,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (declare-function texmathp "ext:texmathp" ()) (require 'reftex) @@ -128,7 +128,7 @@ will prompt for other arguments." ;; Insert the macro and ask for any additional args (insert macro) - (loop for i from 1 to nargs do + (cl-loop for i from 1 to nargs do (setq opt (member i opt-args) value (cond ((= nindex i) key) ((equal ntag i) tag1) @@ -214,16 +214,16 @@ will prompt for other arguments." i -1 val nil) (catch 'exit - (while (and (< (incf i) len) (null val)) + (while (and (< (cl-incf i) len) (null val)) (unless (assq (aref tag i) tag-alist) (push (list (aref tag i) tag (concat (substring tag 0 i) - "[" (substring tag i (incf i)) "]" + "[" (substring tag i (cl-incf i)) "]" (substring tag i))) tag-alist) (throw 'exit t))) - (push (list (+ ?0 (incf cnt)) tag + (push (list (+ ?0 (cl-incf cnt)) tag (concat "[" (int-to-string cnt) "]:" tag)) tag-alist))) (setq tag-alist (nreverse tag-alist)) @@ -317,10 +317,10 @@ will prompt for other arguments." (define-key map "c" 'reftex-index-toggle-context) ;; The capital letters and the exclamation mark - (loop for key across (concat "!" reftex-index-section-letters) do - (define-key map (vector (list key)) - (list 'lambda '() '(interactive) - (list 'reftex-index-goto-letter key)))) + (cl-loop for key across (concat "!" reftex-index-section-letters) do + (define-key map (vector (list key)) + (list 'lambda '() '(interactive) + (list 'reftex-index-goto-letter key)))) (easy-menu-define reftex-index-menu map "Menu for Index buffer" @@ -1426,7 +1426,7 @@ Here are all local bindings. (interactive "p") (reftex-index-phrases-parse-header t) (while (> arg 0) - (decf arg) + (cl-decf arg) (end-of-line) (if (re-search-forward reftex-index-phrases-phrase-regexp12 nil t) (progn @@ -1655,11 +1655,11 @@ this function repeatedly." (widen) (goto-char (point-min)) (while (re-search-forward re1 nil t) - (incf ntimes1)) + (cl-incf ntimes1)) (goto-char (point-min)) (while (re-search-forward re2 nil t) (push (cons (count-lines 1 (point)) (match-string 1)) superphrases) - (incf ntimes2)))) + (cl-incf ntimes2)))) (save-current-buffer (while (setq file (pop files)) (setq buf (reftex-get-file-buffer-force file)) @@ -1672,7 +1672,7 @@ this function repeatedly." (let ((case-fold-search reftex-index-phrases-case-fold-search)) (while (re-search-forward re nil t) (or (reftex-in-comment) - (incf nmatches))))))))) + (cl-incf nmatches))))))))) (with-output-to-temp-buffer "*Help*" (princ (format " Phrase: %s\n" phrase)) (princ (format " Macro key: %s\n" char)) @@ -1682,7 +1682,7 @@ this function repeatedly." (index-key (let ((iks index-keys) (cnt 0) ik) (while (setq ik (pop iks)) - (princ (format "Index entry %d: %s\n" (incf cnt) ik))))) + (princ (format "Index entry %d: %s\n" (cl-incf cnt) ik))))) (repeat (princ (format " Index entry: %s\n" phrase))) (t @@ -1943,7 +1943,7 @@ both ends." (cond ((member char '(?y ?Y ?\ )) ;; Yes! (replace-match rpl t t) - (incf replace-count) + (cl-incf replace-count) ;; See if we should insert newlines to shorten lines (and reftex-index-phrases-wrap-long-lines (reftex-index-phrases-fixup-line beg end)) diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 1d6fa31..9180bea 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -24,7 +24,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (require 'reftex) @@ -306,7 +306,7 @@ of master file." (when reftex-support-index (setq index-entry (reftex-index-info file)) (when index-entry - (add-to-list 'reftex--index-tags (nth 1 index-entry)) + (cl-pushnew (nth 1 index-entry) reftex--index-tags :test #'equal) (push index-entry docstruct)))) ((match-end 11) @@ -608,7 +608,7 @@ if the information is exact (t) or approximate (nil)." found) (save-excursion (while (not rtn) - (incf cnt) + (cl-incf cnt) (setq found (re-search-backward (reftex-everything-regexp) nil t)) (setq rtn (cond @@ -672,7 +672,7 @@ if the information is exact (t) or approximate (nil)." (when (and (eq (car (car list)) 'index) (string= (nth 2 index-info) (nth 2 (car list)))) - (incf n) + (cl-incf n) (setq dist (abs (- (point) (nth 4 (car list))))) (if (or (not last-dist) (< dist last-dist)) (setq last-dist dist last (car list)))) @@ -841,8 +841,8 @@ considered an argument of macro \\macro." (let ((forward-sexp-function nil)) (backward-sexp) t) (error nil))) - (if (eq (following-char) ?\[) (incf cnt-opt)) - (incf cnt)) + (if (eq (following-char) ?\[) (cl-incf cnt-opt)) + (cl-incf cnt)) (setq pos (point)) (when (and (or (= (following-char) ?\[) (= (following-char) ?\{)) @@ -984,18 +984,18 @@ OPT-ARGS is a list of argument numbers which are optional." (while (< cnt n) (while (and (member cnt opt-args) (eq (following-char) ?\{)) - (incf cnt)) + (cl-incf cnt)) (when (< cnt n) (unless (and (condition-case nil (or (forward-list 1) t) (error nil)) (reftex-move-to-next-arg) - (incf cnt)) + (cl-incf cnt)) (setq cnt 1000)))) (while (and (memq cnt opt-args) (eq (following-char) ?\{)) - (incf cnt))) + (cl-incf cnt))) (if (and (= n cnt) (> (skip-chars-forward "{\\[") 0)) (reftex-context-substring) @@ -1057,7 +1057,7 @@ When point is just after a { or [, limit string to matching parenthesis" (- (string-to-char number-string) ?A -1)) (aset reftex-section-numbers i (string-to-number number-string))) (pop numbers)) - (decf i))) + (cl-decf i))) (put 'reftex-section-numbers 'appendix appendix)) ;;;###autoload @@ -1081,7 +1081,7 @@ When LEVEL is non-nil, increase section numbers on that level." (if (or (not partspecial) (not (= idx 1))) (aset reftex-section-numbers idx 0)) - (incf idx)))) + (cl-incf idx)))) (if partspecial (setq string (concat "Part " (reftex-roman-number (aref reftex-section-numbers 0)))) @@ -1091,7 +1091,7 @@ When LEVEL is non-nil, increase section numbers on that level." (if (not (and partspecial (not (equal string "")))) (setq string (concat string (if (not (string= string "")) "." "") (int-to-string n)))) - (incf idx)) + (cl-incf idx)) (save-match-data (if (string-match "\\`\\([@0]\\.\\)+" string) (setq string (replace-match "" nil nil string))) diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el index f5a784b..fdde4aa 100644 --- a/lisp/textmodes/reftex-ref.el +++ b/lisp/textmodes/reftex-ref.el @@ -24,7 +24,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (require 'reftex) (require 'reftex-parse) @@ -374,7 +374,7 @@ also applies `reftex-translate-to-ascii-function' to the string." (sep (or separator ""))) (while (assoc (concat label sep (int-to-string num)) (symbol-value reftex-docstruct-symbol)) - (incf num)) + (cl-incf num)) (setcdr cell num) (concat label sep (int-to-string num)))))) @@ -566,7 +566,7 @@ When called with 2 C-u prefix args, disable magic word recognition." (reftex-erase-buffer)) (unless (eq major-mode 'reftex-select-label-mode) (reftex-select-label-mode)) - (add-to-list 'selection-buffers (current-buffer)) + (cl-pushnew (current-buffer) selection-buffers) (setq truncate-lines t) (setq mode-line-format (list "---- " 'mode-line-buffer-identification diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index 02caa67..d3a7ee4 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -24,7 +24,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (require 'reftex) @@ -32,6 +32,7 @@ ;; and reftex-select-bib-mode-map. (defvar reftex-select-shared-map (let ((map (make-sparse-keymap))) + (set-keymap-parent map special-mode-map) (substitute-key-definition 'next-line 'reftex-select-next map global-map) (substitute-key-definition @@ -41,31 +42,23 @@ (substitute-key-definition 'newline 'reftex-select-accept map global-map) - (loop for x in - '((" " . reftex-select-callback) - ("n" . reftex-select-next) - ([(down)] . reftex-select-next) - ("p" . reftex-select-previous) - ([(up)] . reftex-select-previous) - ("f" . reftex-select-toggle-follow) - ("\C-m" . reftex-select-accept) - ([(return)] . reftex-select-accept) - ("q" . reftex-select-quit) - ("." . reftex-select-show-insertion-point) - ("?" . reftex-select-help)) - do (define-key map (car x) (cdr x))) + (define-key map " " 'reftex-select-callback) + (define-key map "n" 'reftex-select-next) + (define-key map [(down)] 'reftex-select-next) + (define-key map "p" 'reftex-select-previous) + (define-key map [(up)] 'reftex-select-previous) + (define-key map "f" 'reftex-select-toggle-follow) + (define-key map "\C-m" 'reftex-select-accept) + (define-key map [(return)] 'reftex-select-accept) + (define-key map "q" 'reftex-select-quit) + (define-key map "." 'reftex-select-show-insertion-point) + (define-key map "?" 'reftex-select-help) ;; The mouse-2 binding (if (featurep 'xemacs) (define-key map [(button2)] 'reftex-select-mouse-accept) (define-key map [(mouse-2)] 'reftex-select-mouse-accept) (define-key map [follow-link] 'mouse-face)) - - - ;; Digit arguments - (loop for key across "0123456789" do - (define-key map (vector (list key)) 'digit-argument)) - (define-key map "-" 'negative-argument) map)) (define-obsolete-variable-alias @@ -74,28 +67,25 @@ (let ((map (make-sparse-keymap))) (set-keymap-parent map reftex-select-shared-map) - (loop for key across "aAcgFlrRstx#%" do - (define-key map (vector (list key)) - (list 'lambda '() - "Press `?' during selection to find out about this key." - '(interactive) (list 'throw '(quote myexit) key)))) - - (loop for x in - '(("b" . reftex-select-jump-to-previous) - ("z" . reftex-select-jump) - ("v" . reftex-select-cycle-ref-style-forward) - ("V" . reftex-select-cycle-ref-style-backward) - ("m" . reftex-select-mark) - ("u" . reftex-select-unmark) - ("," . reftex-select-mark-comma) - ("-" . reftex-select-mark-to) - ("+" . reftex-select-mark-and) - ([(tab)] . reftex-select-read-label) - ("\C-i" . reftex-select-read-label) - ("\C-c\C-n" . reftex-select-next-heading) - ("\C-c\C-p" . reftex-select-previous-heading)) - do - (define-key map (car x) (cdr x))) + (cl-loop for key across "aAcgFlrRstx#%" do + (define-key map (vector (list key)) + (list 'lambda '() + "Press `?' during selection to find out about this key." + '(interactive) (list 'throw '(quote myexit) key)))) + + (define-key map "b" 'reftex-select-jump-to-previous) + (define-key map "z" 'reftex-select-jump) + (define-key map "v" 'reftex-select-cycle-ref-style-forward) + (define-key map "V" 'reftex-select-cycle-ref-style-backward) + (define-key map "m" 'reftex-select-mark) + (define-key map "u" 'reftex-select-unmark) + (define-key map "," 'reftex-select-mark-comma) + (define-key map "-" 'reftex-select-mark-to) + (define-key map "+" 'reftex-select-mark-and) + (define-key map [(tab)] 'reftex-select-read-label) + (define-key map "\C-i" 'reftex-select-read-label) + (define-key map "\C-c\C-n" 'reftex-select-next-heading) + (define-key map "\C-c\C-p" 'reftex-select-previous-heading) map) "Keymap used for *RefTeX Select* buffer, when selecting a label. @@ -130,18 +120,16 @@ During a selection process, these are the local bindings. (let ((map (make-sparse-keymap))) (set-keymap-parent map reftex-select-shared-map) - (loop for key across "grRaAeE" do - (define-key map (vector (list key)) - (list 'lambda '() - "Press `?' during selection to find out about this key." - '(interactive) (list 'throw '(quote myexit) key)))) + (cl-loop for key across "grRaAeE" do + (define-key map (vector (list key)) + (list 'lambda '() + "Press `?' during selection to find out about this key." + '(interactive) (list 'throw '(quote myexit) key)))) - (loop for x in - '(("\C-i" . reftex-select-read-cite) - ([(tab)] . reftex-select-read-cite) - ("m" . reftex-select-mark) - ("u" . reftex-select-unmark)) - do (define-key map (car x) (cdr x))) + (define-key map "\C-i" 'reftex-select-read-cite) + (define-key map [(tab)] 'reftex-select-read-cite) + (define-key map "m" 'reftex-select-mark) + (define-key map "u" 'reftex-select-unmark) map) "Keymap used for *RefTeX Select* buffer, when selecting a BibTeX entry. @@ -272,7 +260,7 @@ During a selection process, these are the local bindings. ;; Walk the docstruct and insert the appropriate stuff (while (setq cell (pop all)) - (incf index) + (cl-incf index) (setq from (point)) (cond @@ -342,7 +330,7 @@ During a selection process, these are the local bindings. (or show-commented (null comment))) ;; Yes we want this one - (incf cnt) + (cl-incf cnt) (setq prev-inserted cell) ; (if (eq offset 'attention) (setq offset cell)) @@ -728,8 +716,8 @@ Cycle in reverse order if optional argument REVERSE is non-nil." (setq sep (nth 2 c)) (reftex-overlay-put (nth 1 c) 'before-string (if sep - (format "*%c%d* " sep (decf cnt)) - (format "*%d* " (decf cnt))))) + (format "*%c%d* " sep (cl-decf cnt)) + (format "*%d* " (cl-decf cnt))))) reftex-select-marked) (message "Entry no longer marked"))) diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index d1a6b87..d6de53b 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -24,7 +24,7 @@ ;;; Code: (defvar reftex-tables-dirty) -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) (eval-and-compile (defun reftex-set-dirty (symbol value) (setq reftex-tables-dirty t) @@ -1076,9 +1076,9 @@ used in the variable `reftex-ref-style-alist'." ;; Compatibility with obsolete variables. (when reftex-vref-is-default - (add-to-list 'reftex-ref-style-default-list "Varioref")) + (cl-pushnew "Varioref" reftex-ref-style-default-list :test #'equal)) (when reftex-fref-is-default - (add-to-list 'reftex-ref-style-default-list "Fancyref")) + (cl-pushnew "Fancyref" reftex-ref-style-default-list :test #'equal)) (defcustom reftex-level-indent 2 "Number of spaces to be used for indentation per section level." diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 24fa0d1..adc5076 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -50,7 +50,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl-lib)) ;; Stuff that needs to be there when we use defcustom (require 'custom) @@ -290,7 +290,7 @@ on the menu bar. (defun reftex-next-multifile-index () ;; Return the next free index for multifile symbols. - (incf reftex-multifile-index)) + (cl-incf reftex-multifile-index)) (defun reftex-tie-multifile-symbols () "Tie the buffer-local symbols to globals connected with the master file. @@ -479,7 +479,7 @@ will deactivate it." (unless (member style list) (setq reftex-tables-dirty t changed t) - (add-to-list 'list style t))) + (setq list (append list (list style))))) ((eq action 'deactivate) (when (member style list) (setq reftex-tables-dirty t @@ -488,7 +488,7 @@ will deactivate it." (t (if (member style list) (delete style list) - (add-to-list 'list style t)) + (setq list (append list (list style)))) (setq reftex-tables-dirty t changed t))) (when changed @@ -831,15 +831,15 @@ This enforces rescanning the buffer on next use." reffmt (nth 1 fmt)) ;; Note a new typekey (if typekey - (add-to-list 'reftex-typekey-list typekey)) + (cl-pushnew typekey reftex-typekey-list :test #'equal)) (if (and typekey prefix (not (assoc prefix reftex-prefix-to-typekey-alist))) - (add-to-list 'reftex-prefix-to-typekey-alist - (cons prefix typekey))) + (cl-pushnew (cons prefix typekey) reftex-prefix-to-typekey-alist + :test #'equal)) (if (and typekey prefix (not (assoc typekey reftex-typekey-to-prefix-alist))) - (add-to-list 'reftex-typekey-to-prefix-alist - (cons typekey prefix))) + (cl-pushnew (cons typekey prefix) reftex-typekey-to-prefix-alist + :test #'equal)) ;; Check if this is a macro or environment (cond ((symbolp env-or-mac) @@ -848,17 +848,17 @@ This enforces rescanning the buffer on next use." (message "Warning: %s does not seem to be a valid function" env-or-mac)) (setq nargs nil nlabel nil opt-args nil) - (add-to-list 'reftex-special-env-parsers env-or-mac) + (cl-pushnew env-or-mac reftex-special-env-parsers) (setq env-or-mac (symbol-name env-or-mac))) ((string-match "\\`\\\\" env-or-mac) ;; It's a macro (let ((result (reftex-parse-args env-or-mac))) - (setq env-or-mac (or (first result) env-or-mac) - nargs (second result) - nlabel (third result) - opt-args (fourth result)) - (if nlabel (add-to-list 'macros-with-labels env-or-mac))) - (if typekey (add-to-list 'reftex-label-mac-list env-or-mac))) + (setq env-or-mac (or (cl-first result) env-or-mac) + nargs (cl-second result) + nlabel (cl-third result) + opt-args (cl-fourth result)) + (if nlabel (cl-pushnew env-or-mac macros-with-labels :test #'equal))) + (if typekey (cl-pushnew env-or-mac reftex-label-mac-list :test #'equal))) (t ;; It's an environment (setq nargs nil nlabel nil opt-args nil) @@ -866,7 +866,7 @@ This enforces rescanning the buffer on next use." ((string= env-or-mac "")) ((string= env-or-mac "section")) (t - (add-to-list 'reftex-label-env-list env-or-mac) + (cl-pushnew env-or-mac reftex-label-env-list :test #'equal) (if toc-level (let ((string (format "begin{%s}" env-or-mac))) (or (assoc string toc-levels) @@ -950,7 +950,7 @@ This enforces rescanning the buffer on next use." (not (member (aref fmt i) '(?%)))) (setq word (concat word "\\|" (regexp-quote (substring fmt 0 (1+ i))))) - (incf i)) + (cl-incf i)) (cons (concat word "\\)\\=") typekey)) (nreverse reftex-words-to-typekey-alist))) @@ -976,10 +976,10 @@ This enforces rescanning the buffer on next use." (t t)) all-index (cdr all-index)) (let ((result (reftex-parse-args macro))) - (setq macro (or (first result) macro) - nargs (second result) - nindex (third result) - opt-args (fourth result)) + (setq macro (or (cl-first result) macro) + nargs (cl-second result) + nindex (cl-third result) + opt-args (cl-fourth result)) (unless (member macro reftex-macros-with-index) ;; 0 1 2 3 4 5 6 7 (push (list macro tag prefix verify nargs nindex opt-args repeat) @@ -1003,7 +1003,7 @@ This enforces rescanning the buffer on next use." (mapconcat (lambda(x) (format "[%c] %-20.20s%s" (car x) (nth 1 x) - (if (= 0 (mod (incf i) 3)) "\n" ""))) + (if (= 0 (mod (cl-incf i) 3)) "\n" ""))) reftex-key-to-index-macro-alist ""))) ;; Make the full list of section levels @@ -1093,7 +1093,7 @@ This enforces rescanning the buffer on next use." (args (substring macro (match-beginning 0))) opt-list nlabel (cnt 0)) (while (string-match "\\`[[{]\\(\\*\\)?[]}]" args) - (incf cnt) + (cl-incf cnt) (when (eq ?\[ (string-to-char args)) (push cnt opt-list)) (when (and (match-end 1) @@ -1158,7 +1158,7 @@ This enforces rescanning the buffer on next use." (defun reftex-silence-toc-markers (list n) ;; Set all toc markers in the first N entries in list to nil - (while (and list (> (decf n) -1)) + (while (and list (> (cl-decf n) -1)) (and (eq (car (car list)) 'toc) (markerp (nth 4 (car list))) (set-marker (nth 4 (car list)) nil)) @@ -1289,7 +1289,7 @@ Valid actions are: readable, restore, read, kill, write." "SELECT EXTERNAL DOCUMENT\n------------------------\n" (mapconcat (lambda (x) - (format fmt (incf n) (or (car x) "") + (format fmt (cl-incf n) (or (car x) "") (abbreviate-file-name (cdr x)))) xr-alist "")) nil t)) @@ -1793,11 +1793,11 @@ When DIE is non-nil, throw an error if file not found." ;; with limited Magic ;; The magic goes away - (letf ((format-alist nil) - (auto-mode-alist (reftex-auto-mode-alist)) - ((default-value 'major-mode) 'fundamental-mode) - (enable-local-variables nil) - (after-insert-file-functions nil)) + (cl-letf ((format-alist nil) + (auto-mode-alist (reftex-auto-mode-alist)) + ((default-value 'major-mode) 'fundamental-mode) + (enable-local-variables nil) + (after-insert-file-functions nil)) (setq buf (find-file-noselect file))) ;; Is there a hook to run? @@ -1807,7 +1807,7 @@ When DIE is non-nil, throw an error if file not found." ;; Let's see if we got a license to kill :-| (and mark-to-kill - (add-to-list 'reftex-buffers-to-kill buf)) + (cl-pushnew buf reftex-buffers-to-kill)) ;; Return the new buffer buf) @@ -2265,7 +2265,7 @@ IGNORE-WORDS List of words which should be removed from the string." :style 'toggle :selected `(member ,elt (reftex-ref-style-list)))) (unless (member item list) - (add-to-list 'list item t))) + (setq list (append list (list item))))) list)) ("Citation Style" ,@(mapcar commit 92b3528cf3e6d366086e89b9a909f0c81614a064 Author: Tino Calancha Date: Sat Nov 19 20:48:17 2016 +0900 ibuffer-exchange-filters: Simplify code * lisp/ibuf-ext.el (ibuffer-exchange-filters): Use cl-rotatef. diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index b3d1452..5ef0746 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -869,14 +869,11 @@ turned into two separate filters [name: foo] and [mode: bar-mode]." (defun ibuffer-exchange-filters () "Exchange the top two filters on the stack in this buffer." (interactive) - (when (< (length ibuffer-filtering-qualifiers) - 2) - (error "Need two filters to exchange")) - (let ((first (pop ibuffer-filtering-qualifiers)) - (second (pop ibuffer-filtering-qualifiers))) - (push first ibuffer-filtering-qualifiers) - (push second ibuffer-filtering-qualifiers)) - (ibuffer-update nil t)) + (let ((filters ibuffer-filtering-qualifiers)) + (when (< (length filters) 2) + (error "Need two filters to exchange")) + (cl-rotatef (car filters) (cadr filters)) + (ibuffer-update nil t))) ;;;###autoload (defun ibuffer-negate-filter () commit 4cdd14eabe5a6121691daa2d9c5e814c5f53f3e5 Author: Eli Zaretskii Date: Sat Nov 19 12:17:23 2016 +0200 Implement getrlimit and setrlimit for MS-Windows * src/w32heap.c (getrlimit, setrlimit): New functions. Include w32.h. * src/emacs.c (main): Use 'rlim_t', not 'long', for values that should be compatible with 'struct rlimit' members. * nt/inc/sys/resource.h: New header file. * nt/mingw-cfg.site (ac_cv_func_getrlimit, ac_cv_func_setrlimit): Set to "yes". diff --git a/nt/inc/sys/resource.h b/nt/inc/sys/resource.h new file mode 100644 index 0000000..dfa0318 --- /dev/null +++ b/nt/inc/sys/resource.h @@ -0,0 +1,51 @@ +/* A limited emulation of sys/resource.h. + +Copyright (C) 2016 Free Software Foundation, Inc. + +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 . */ + +#ifndef INC_SYS_RESOURCE_H_ +#define INC_SYS_RESOURCE_H_ + +/* We only support RLIMIT_STACK and RLIMIT_NOFILE for now. */ +enum rlimit_resource { + RLIMIT_STACK = 0, +#define RLIMIT_STACK RLIMIT_STACK + + RLIMIT_NOFILE = 1, +#define RLIMIT_NOFILE RLIMIT_NOFILE + + RLIMIT_NLIMITS +#define RLIMIT_NLIMITS RLIMIT_NLIMITS +}; + +typedef enum rlimit_resource rlimit_resource_t; + +/* We use a 64-bit data type because some values could potentially be + 64-bit wide even in 32-bit builds. */ +typedef long long rlim_t; + +#define RLIMIT_INFINITY ((rlim_t) -1) + +struct rlimit { + rlim_t rlim_cur; /* current soft limit */ + rlim_t rlim_max; /* hard limit */ +}; + +extern int getrlimit (rlimit_resource_t, struct rlimit *); +extern int setrlimit (rlimit_resource_t, const struct rlimit *); + +#endif /* INC_SYS_RESOURCE_H_ */ diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site index 3e0cd40..a106717 100644 --- a/nt/mingw-cfg.site +++ b/nt/mingw-cfg.site @@ -131,5 +131,7 @@ ac_cv_func_random=yes gl_cv_func_svid_putenv=yes # Implemented in w32heap.c ac_cv_func_sbrk=yes +ac_cv_func_getrlimit=yes +ac_cv_func_setrlimit=yes # GCC warnings that produce too much noise gl_cv_warn_c__Wredundant_decls=no diff --git a/src/emacs.c b/src/emacs.c index 92cbb08..d86c34f 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -829,7 +829,7 @@ main (int argc, char **argv) if (getrlimit (RLIMIT_STACK, &rlim) == 0 && 0 <= rlim.rlim_cur && rlim.rlim_cur <= LONG_MAX) { - long lim = rlim.rlim_cur; + rlim_t lim = rlim.rlim_cur; /* Approximate the amount regex.c needs per unit of re_max_failures, then add 33% to cover the size of the @@ -848,7 +848,7 @@ main (int argc, char **argv) if (try_to_grow_stack) { - long newlim = re_max_failures * ratio + extra; + rlim_t newlim = re_max_failures * ratio + extra; /* Round the new limit to a page boundary; this is needed for Darwin kernel 15.4.0 (see Bug#23622) and perhaps diff --git a/src/w32heap.c b/src/w32heap.c index 43b5f35..26a0441 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -50,9 +50,11 @@ #include #include +#include #include "w32common.h" #include "w32heap.h" #include "lisp.h" +#include "w32.h" /* for FD_SETSIZE */ /* We chose to leave those declarations here. They are used only in this file. The RtlCreateHeap is available since XP. It is located @@ -317,6 +319,9 @@ init_heap (void) cache_system_info (); } + +/* malloc, realloc, free. */ + #undef malloc #undef realloc #undef free @@ -623,9 +628,12 @@ sbrk (ptrdiff_t increment) return data_region_end; } -#define MAX_BUFFER_SIZE (512 * 1024 * 1024) + /* MMAP allocation for buffers. */ + +#define MAX_BUFFER_SIZE (512 * 1024 * 1024) + void * mmap_alloc (void **var, size_t nbytes) { @@ -788,3 +796,78 @@ mmap_realloc (void **var, size_t nbytes) /* Not enlarging, not shrinking by more than one page. */ return *var; } + + +/* Emulation of getrlimit and setrlimit. */ + +int +getrlimit (rlimit_resource_t rltype, struct rlimit *rlp) +{ + int retval = -1; + + switch (rltype) + { + case RLIMIT_STACK: + { + MEMORY_BASIC_INFORMATION m; + /* Implementation note: Posix says that RLIMIT_STACK returns + information about the stack size for the main thread. The + implementation below returns the stack size for the calling + thread, so it's more like pthread_attr_getstacksize. But + Emacs clearly wants the latter, given how it uses the + results, so the implementation below is more future-proof, + if what's now the main thread will become some other thread + at some future point. */ + if (!VirtualQuery ((LPCVOID) &m, &m, sizeof m)) + errno = EPERM; + else + { + rlp->rlim_cur = (DWORD_PTR) &m - (DWORD_PTR) m.AllocationBase; + rlp->rlim_max = + (DWORD_PTR) m.BaseAddress + m.RegionSize + - (DWORD_PTR) m.AllocationBase; + + /* The last page is the guard page, so subtract that. */ + rlp->rlim_cur -= getpagesize (); + rlp->rlim_max -= getpagesize (); + retval = 0; + } + } + break; + case RLIMIT_NOFILE: + /* Implementation note: The real value is returned by + _getmaxstdio. But our FD_SETSIZE is smaller, to cater to + Windows 9X, and process.c includes some logic that's based on + the assumption that the handle resource is inherited to child + processes. We want to avoid that logic, so we tell process.c + our current limit is already equal to FD_SETSIZE. */ + rlp->rlim_cur = FD_SETSIZE; + rlp->rlim_max = 2048; /* see _setmaxstdio documentation */ + retval = 0; + break; + default: + /* Note: we could return meaningful results for other RLIMIT_* + requests, but Emacs doesn't currently need that, so we just + punt for them. */ + errno = ENOSYS; + break; + } + return retval; +} + +int +setrlimit (rlimit_resource_t rltype, const struct rlimit *rlp) +{ + switch (rltype) + { + case RLIMIT_STACK: + case RLIMIT_NOFILE: + /* We cannot modfy these limits, so we always fail. */ + errno = EPERM; + break; + default: + errno = ENOSYS; + break; + } + return -1; +} commit 1a210f089891031909b30b5770e323db6e2ba382 Author: Eli Zaretskii Date: Sat Nov 19 09:23:33 2016 +0200 * admin/release-process: Update versions and blocking bug numbers. diff --git a/admin/release-process b/admin/release-process index e4ef4d9..6aa0040 100644 --- a/admin/release-process +++ b/admin/release-process @@ -46,12 +46,12 @@ See admin/gitmerge.el. Emacs uses the "blocking" feature of Debbugs for bugs that need to be addressed in the next release. -Currently, bug#19759 is the tracking bug for release of 25.1 and -bug#21966 is the tracking bug for the next release. Say bug#123 needs -to be fixed for Emacs 25.1. Send a message to control@debbugs.gnu.org +Currently, bug#21966 is the tracking bug for release of 25.2 and +bug#24655 is the tracking bug for release 26.1. Say bug#123 needs +to be fixed for Emacs 26.1. Send a message to control@debbugs.gnu.org that says: - block 19759 by 123 + block 24655 by 123 Change "block" to "unblock" to remove a bug from the list. Closed bugs are not listed as blockers, so you do not need to explicitly commit 36bafc9cee918e88f9f62dd8ac2a1a0f6495c0b1 Author: Eli Zaretskii Date: Fri Nov 18 13:02:34 2016 +0200 Improve documentation of functions that accept time values * doc/lispref/os.texi (Time Calculations): Mention the meaning of 'nil' or a scalar number as the time-value argument. Add a cross-reference to 'float-time' for computing a time difference as a scalar number of seconds. * src/editfns.c (Fformat_time_string, Ftime_less_p) (Ftime_subtract, Ftime_add, Fdecode_time, Fcurrent_time_string) (Fcurrent_time_zone): Mention in the doc strings the meaning of nil argument and the fact that a time value can be a scalar number of seconds since the epoch. (Ftime_subtract): Mention 'float-time'. diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 6b9b2c7..fa1c738 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1472,7 +1472,7 @@ corresponding time value. @defun format-time-string format-string &optional time zone This function converts @var{time} (or the current time, if -@var{time} is omitted) to a string according to +@var{time} is omitted or @code{nil}) to a string according to @var{format-string}. The conversion uses the time zone rule @var{zone}, which defaults to the current time zone rule. @xref{Time Zone Rules}. The argument @var{format-string} may contain @samp{%}-sequences which say to @@ -1690,7 +1690,9 @@ interactively, it prints the duration in the echo area. @cindex calendrical computations These functions perform calendrical computations using time values -(@pxref{Time of Day}). +(@pxref{Time of Day}). A value of @code{nil} for any of their +time-value arguments stands for the current system time, and a single +integer number stands for the number of seconds since the epoch. @defun time-less-p t1 t2 This returns @code{t} if time value @var{t1} is less than time value @@ -1699,12 +1701,15 @@ This returns @code{t} if time value @var{t1} is less than time value @defun time-subtract t1 t2 This returns the time difference @var{t1} @minus{} @var{t2} between -two time values, as a time value. +two time values, as a time value. If you need the difference in units +of elapsed seconds, use @code{float-time} (@pxref{Time of Day, +float-time}) to convert the result into seconds. @end defun @defun time-add t1 t2 This returns the sum of two time values, as a time value. -One argument should represent a time difference rather than a point in time. +One argument should represent a time difference rather than a point in time, +either as a list or as a single number of elapsed seconds. Here is how to add a number of seconds to a time value: @example diff --git a/src/editfns.c b/src/editfns.c index 403569f..5cc4a67 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1581,21 +1581,28 @@ time_arith (Lisp_Object a, Lisp_Object b, } DEFUN ("time-add", Ftime_add, Stime_add, 2, 2, 0, - doc: /* Return the sum of two time values A and B, as a time value. */) + doc: /* Return the sum of two time values A and B, as a time value. +A nil value for either argument stands for the current time. +See `current-time-string' for the various forms of a time value. */) (Lisp_Object a, Lisp_Object b) { return time_arith (a, b, time_add); } DEFUN ("time-subtract", Ftime_subtract, Stime_subtract, 2, 2, 0, - doc: /* Return the difference between two time values A and B, as a time value. */) + doc: /* Return the difference between two time values A and B, as a time value. +Use `float-time' to convert the difference into elapsed seconds. +A nil value for either argument stands for the current time. +See `current-time-string' for the various forms of a time value. */) (Lisp_Object a, Lisp_Object b) { return time_arith (a, b, time_subtract); } DEFUN ("time-less-p", Ftime_less_p, Stime_less_p, 2, 2, 0, - doc: /* Return non-nil if time value T1 is earlier than time value T2. */) + doc: /* Return non-nil if time value T1 is earlier than time value T2. +A nil value for either argument stands for the current time. +See `current-time-string' for the various forms of a time value. */) (Lisp_Object t1, Lisp_Object t2) { int t1len, t2len; @@ -1973,11 +1980,13 @@ emacs_nmemftime (char *s, size_t maxsize, const char *format, } DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 1, 3, 0, - doc: /* Use FORMAT-STRING to format the time TIME, or now if omitted. + doc: /* Use FORMAT-STRING to format the time TIME, or now if omitted or nil. TIME is specified as (HIGH LOW USEC PSEC), as returned by -`current-time' or `file-attributes'. The obsolete form (HIGH . LOW) -is also still accepted. The optional ZONE is omitted or nil for Emacs -local time, t for Universal Time, `wall' for system wall clock time, +`current-time' or `file-attributes'. +It can also be a single integer number of seconds since the epoch. +The obsolete form (HIGH . LOW) is also still accepted. +The optional ZONE is omitted or nil for Emacs local time, +t for Universal Time, `wall' for system wall clock time, or a string as in the TZ environment variable. The value is a copy of FORMAT-STRING, but with certain constructs replaced @@ -2094,7 +2103,9 @@ DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 2, 0, doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST UTCOFF). The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED), as from `current-time' and `file-attributes', or nil to use the -current time. The obsolete form (HIGH . LOW) is also still accepted. +current time. +It can also be a single integer number of seconds since the epoch. +The obsolete form (HIGH . LOW) is also still accepted. The optional ZONE is omitted or nil for Emacs local time, t for Universal Time, `wall' for system wall clock time, or a string as in the TZ environment variable. @@ -2219,8 +2230,10 @@ which provide a much more powerful and general facility. If SPECIFIED-TIME is given, it is a time to format instead of the current time. The argument should have the form (HIGH LOW . IGNORED). Thus, you can use times obtained from `current-time' and from -`file-attributes'. SPECIFIED-TIME can also have the form (HIGH . LOW), -but this is considered obsolete. +`file-attributes'. SPECIFIED-TIME can also be a single integer +number of seconds since the epoch. +SPECIFIED-TIME can also have the form (HIGH . LOW), but this is +considered obsolete. The optional ZONE is omitted or nil for Emacs local time, t for Universal Time, `wall' for system wall clock time, or a string as in @@ -2298,8 +2311,9 @@ NAME is a string giving the name of the time zone. If SPECIFIED-TIME is given, the time zone offset is determined from it instead of using the current time. The argument should have the form \(HIGH LOW . IGNORED). Thus, you can use times obtained from -`current-time' and from `file-attributes'. SPECIFIED-TIME can also -have the form (HIGH . LOW), but this is considered obsolete. +`current-time' and from `file-attributes'. SPECIFIED-TIME can also be +a single integer number of seconds since the epoch. SPECIFIED-TIME can +also have the form (HIGH . LOW), but this is considered obsolete. Optional second arg ZONE is omitted or nil for the local time zone, or a string as in the TZ environment variable. commit a37c08d524db722063111329458dc8f4368c46a2 Author: Daniel Colascione Date: Thu Oct 6 12:46:36 2016 -0700 Speed up initialization by preferring /dev/urandom to GnuTLS * src/sysdep.c (init_random): Try /dev/urandom before GnuTLS. (cherry picked from commit a37eba849eddc41375ad73974f6fcb1258aa8eba) diff --git a/src/sysdep.c b/src/sysdep.c index 674e76d..3f941c2 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2106,27 +2106,35 @@ void init_random (void) { random_seed v; - if (! (EQ (emacs_gnutls_global_init (), Qt) - && gnutls_rnd (GNUTLS_RND_NONCE, &v, sizeof v) == 0)) - { - bool success = false; -#ifndef WINDOWSNT - int fd = emacs_open ("/dev/urandom", O_RDONLY | O_BINARY, 0); - if (0 <= fd) - { - success = emacs_read (fd, &v, sizeof v) == sizeof v; - emacs_close (fd); - } + bool success = false; + + /* First, try seeding the PRNG from the operating system's entropy + source. This approach is both fast and secure. */ +#ifdef WINDOWSNT + success = w32_init_random (&v, sizeof v) == 0; #else - success = w32_init_random (&v, sizeof v) == 0; + int fd = emacs_open ("/dev/urandom", O_RDONLY, 0); + if (0 <= fd) + { + success = emacs_read (fd, &v, sizeof v) == sizeof v; + close (fd); + } #endif - if (! success) - { - /* Fall back to current time value + PID. */ - struct timespec t = current_timespec (); - v = getpid () ^ t.tv_sec ^ t.tv_nsec; - } + + /* If that didn't work, try using GnuTLS, which is secure, but on + some systems, can be somewhat slow. */ + if (!success) + success = EQ (emacs_gnutls_global_init (), Qt) + && gnutls_rnd (GNUTLS_RND_NONCE, &v, sizeof v) == 0; + + /* If _that_ didn't work, just use the current time value and PID. + It's at least better than XKCD 221. */ + if (!success) + { + struct timespec t = current_timespec (); + v = getpid () ^ t.tv_sec ^ t.tv_nsec; } + set_random_seed (v); } commit 4af5981dc75c96e34a27922001106df05ee19e69 Author: Glenn Morris Date: Thu Nov 17 23:24:03 2016 -0800 Add a comment in generated refcards about the source * etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex: * etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex: * etc/refcards/fr-survival.tex, etc/refcards/gnus-refcard.tex: * etc/refcards/orgcard.tex, etc/refcards/pl-refcard.tex: * etc/refcards/pt-br-refcard.tex, etc/refcards/refcard.tex: * etc/refcards/ru-refcard.tex, etc/refcards/sk-dired-ref.tex: * etc/refcards/sk-refcard.tex, etc/refcards/sk-survival.tex: * etc/refcards/survival.tex, etc/refcards/vipcard.tex: * etc/refcards/viperCard.tex: Add comment about the source. diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index 6402ed3..e692ca4 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex @@ -81,6 +81,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + \endgroup} % make \bye not \outer so that the \def\bye in the \else clause below diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex index d24e464..c36167d 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-dired-ref.tex @@ -63,6 +63,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex index 8e89c32..1548310 100644 --- a/etc/refcards/cs-refcard.tex +++ b/etc/refcards/cs-refcard.tex @@ -80,6 +80,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index a34c409..77893ae 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -68,7 +68,10 @@ Do češtiny přeložil Pavel Janík (Pavel@Janik.cz) Released under the terms of the GNU General Public License - version 3 or later.\par}} + version 3 or later. + + \TeX{} source for this card is distributed with Emacs in + {\tt etc/refcards/}\par}} \hsize 3.2in \vsize 7.95in diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex index 9435d68..89636a8 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex @@ -82,6 +82,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + F\"ur Kopien des Handbuchs zu GNU Emacs: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex index b691faf..5f8d8ba 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.tex @@ -64,6 +64,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex index cfbd9b4..913372b 100644 --- a/etc/refcards/fr-dired-ref.tex +++ b/etc/refcards/fr-dired-ref.tex @@ -58,6 +58,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + Pour obtenir des copies du manuel de GNU Emacs: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex index 6d3acb3..ddaa85b 100644 --- a/etc/refcards/fr-refcard.tex +++ b/etc/refcards/fr-refcard.tex @@ -78,6 +78,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + Pour des copies du manuel GNU Emacs: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex index ed3cafa..a6279e8 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex @@ -63,7 +63,10 @@ Traduction fran\c{c}aise \'Eric Jacoboni (jaco@teaser.fr) Released under the terms of the GNU General Public License - version 3 or later.\par}} + version 3 or later. + + \TeX{} source for this card is distributed with Emacs in {\tt + etc/refcards/}\par}} \hsize 3.2in \vsize 7.95in diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex index 674c399..46d0d7d 100644 --- a/etc/refcards/gnus-refcard.tex +++ b/etc/refcards/gnus-refcard.tex @@ -125,6 +125,8 @@ Released under the terms of the GNU General Public License version 3 or later. + \TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + Please send corrections, additions and suggestions to the current maintainer's email address. \Guide{} last edited on \date. } diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 64a1403..a5a6626 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -80,6 +80,8 @@ \centerline{Released under the terms of the GNU General Public License} \centerline{version 3 or later.} +\centerline{\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}} + \endgroup} % make \bye not \outer so that the \def\bye in the \else clause below diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index 46091ea..df370d4 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -90,6 +90,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http:////www.gnu.org//software//emacs//\#Manuals} diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex index ee15059..27849a3 100644 --- a/etc/refcards/pt-br-refcard.tex +++ b/etc/refcards/pt-br-refcard.tex @@ -83,6 +83,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index 4a3a5a7..6eefd15 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex @@ -81,6 +81,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index f0b0bc1..216d474 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -56,6 +56,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex index 90007d8..81f1122 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex @@ -64,6 +64,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index 64982c6..27b3a38 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex @@ -81,6 +81,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index 5abcdc2..152009b 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -70,7 +70,10 @@ Do slovenčiny preložil Miroslav Vaško (vasko@debian.cz) Released under the terms of the GNU General Public License - version 3 or later.\par}} + version 3 or later. + + \TeX{} source for this card is distributed with Emacs in + {\tt etc/refcards/}\par}} \hsize 3.2in \vsize 7.95in diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex index c5a3f9b..2d81b30 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex @@ -57,7 +57,10 @@ Author W{\l}odek Bzyl (matwb@univ.gda.pl) Released under the terms of the GNU General Public License - version 3 or later.\par}} + version 3 or later. + + \TeX{} source for this card is distributed with Emacs in + {\tt etc/refcards/}\par}} \hsize 3.2in \vsize 7.95in diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex index cb1e432..5eca55c 100644 --- a/etc/refcards/vipcard.tex +++ b/etc/refcards/vipcard.tex @@ -73,6 +73,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex index a22a655..d984ffc 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex @@ -77,6 +77,8 @@ Released under the terms of the GNU General Public License version 3 or later. +\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} + For copies of the GNU Emacs manual, see: {\tt http://www.gnu.org/software/emacs/\#Manuals} commit ef880a5e1ca6bfa17c2bca34a629c09342ed30bb Author: Glenn Morris Date: Thu Nov 17 22:59:36 2016 -0800 ; * etc/refcards/calccard.tex: Remove obsolete comment. diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index bf486b5..6402ed3 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex @@ -81,10 +81,6 @@ Released under the terms of the GNU General Public License version 3 or later. -%For copies of the GNU Emacs Calc manual, write to the Free Software -%Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -%MA 02110-1301, USA. -% \endgroup} % make \bye not \outer so that the \def\bye in the \else clause below commit 4887e7c6cbe022bd54ec42f3bdceae8fa434a0cd Author: Dmitry Gutov Date: Thu Nov 17 01:58:59 2016 +0200 js-mode: Fix indent problem after a regexp * lisp/progmodes/js.el (js--looking-at-operator-p): Check that the slash is not ending a regexp (bug#24854). diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index f024d39..6d995a0 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1757,6 +1757,10 @@ This performs fontification according to `js--class-styles'." (and (js--re-search-backward "[?:{]\\|\\_" nil t) (eq (char-after) ??)))) (not (and + (eq (char-after) ?/) + (save-excursion + (eq (nth 3 (syntax-ppss)) ?/)))) + (not (and (eq (char-after) ?*) ;; Generator method (possibly using computed property). (looking-at (concat "\\* *\\(?:\\[\\|" js--name-re " *(\\)")) commit e992ac0a639d01df8f04c18061b0d73f792ff2c2 Author: Eli Zaretskii Date: Wed Nov 16 18:11:33 2016 +0200 Fix sluggish display of symbols in UTF-8 language environment * lisp/international/fontset.el (setup-default-fontset): Make sure Symbola and FreeMono are set up in the default fontset as belonging to the "iso10646-1" registry. In the UTF-8 locale, this avoids a long and futile search for a suitable font, whose side effect is a lot of consing, which then hits the font-cache compacting issue, and causes very sluggish redisplay of characters displayed by these fonts. All this happens because the default for the registry is "iso8859-1". (Bug#24953) diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 612c0a0..659f03a 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -812,10 +812,11 @@ (#x1F700 . #x1F77F) ;; Alchemical Symbols (#x1F780 . #x1F7FF) ;; Geometric Shapes Extended (#x1F800 . #x1F8FF))) ;; Supplemental Arrows-C - (set-fontset-font "fontset-default" symbol-subgroup "Symbola" nil 'prepend)) + (set-fontset-font "fontset-default" symbol-subgroup + '("Symbola" . "iso10646-1") nil 'prepend)) ;; Box Drawing and Block Elements (set-fontset-font "fontset-default" '(#x2500 . #x259F) - "FreeMono" nil 'prepend) + '("FreeMono" . "iso10646-1") nil 'prepend) ;; Since standard-fontset-spec on X uses fixed-medium font, which ;; gets mapped to a iso8859-1 variant, we would like to prefer its commit 1fc101b0c4009e664c102b896e8d510f4821e754 Author: Glenn Morris Date: Tue Nov 15 19:18:28 2016 -0500 Don't confuse how Texinfo outputs @var with the input * doc/emacs/rmail.texi (Movemail): * doc/lispref/control.texi (Pattern matching case statement): * doc/lispref/frames.texi (Size and Position): * doc/lispref/processes.texi (Asynchronous Processes): * doc/lispref/text.texi (Document Object Model): * doc/lispref/windows.texi (Coordinates and Windows): Do not upper-case the argument of @var. diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index a8cf5e4..84f1296 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1425,7 +1425,7 @@ local mailbox. @end table @noindent -@var{Proto} can be one of: +@var{proto} can be one of: @table @code @item mbox @@ -1434,12 +1434,12 @@ Usual Unix mailbox format. In this case, neither @var{user} nor of the mailbox file, e.g., @code{mbox://var/spool/mail/smith}. @item mh -A local mailbox in the @acronym{MH} format. @var{User} and -@var{pass} are not used. @var{Host-or-file-name} denotes the name of +A local mailbox in the @acronym{MH} format. @var{user} and +@var{pass} are not used. @var{host-or-file-name} denotes the name of @acronym{MH} folder, e.g., @code{mh://Mail/inbox}. @item maildir -A local mailbox in the @acronym{maildir} format. @var{User} and +A local mailbox in the @acronym{maildir} format. @var{user} and @var{pass} are not used, and @var{host-or-file-name} denotes the name of @code{maildir} mailbox, e.g., @code{maildir://mail/inbox}. @@ -1448,14 +1448,14 @@ Any local mailbox format. Its actual format is detected automatically by @code{movemail}. @item pop -A remote mailbox to be accessed via POP3 protocol. @var{User} +A remote mailbox to be accessed via POP3 protocol. @var{user} specifies the remote user name to use, @var{pass} may be used to specify the user password, @var{host-or-file-name} is the name or IP address of the remote mail server to connect to; e.g., @code{pop://smith:guessme@@remote.server.net}. @item imap -A remote mailbox to be accessed via IMAP4 protocol. @var{User} +A remote mailbox to be accessed via IMAP4 protocol. @var{user} specifies the remote user name to use, @var{pass} may be used to specify the user password, @var{host-or-file-name} is the name or IP address of the remote mail server to connect to; diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 0c08279..947c54f 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -368,7 +368,7 @@ UPattern. For example: @item (app @var{function} @var{upattern}) Matches if @var{function} applied to the value being matched returns a value that matches @var{upattern}. This is like the @code{pred} -UPattern, except that it tests the result against @var{UPattern}, +UPattern, except that it tests the result against @var{upattern}, rather than against a boolean truth value. The @var{function} call can use one of the forms described below. @item (or @var{upattern1} @var{upattern2}@dots{}) diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index ea7da08..ec344c7 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -772,9 +772,9 @@ origin at the position (0, 0) of the frame's display. On a text terminal frame both values are zero. @end defun -@defun set-frame-position frame X Y -This function sets the outer frame position of @var{frame} to @var{X} -and @var{Y}. The latter arguments specify pixels and normally count +@defun set-frame-position frame x y +This function sets the outer frame position of @var{frame} to @var{x} +and @var{y}. The latter arguments specify pixels and normally count from an origin at the position (0, 0) of @var{frame}'s display. A negative parameter value positions the right edge of the outer frame diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 9c4f8ca..950dc9c 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -642,7 +642,7 @@ I/O, file-name-coding-system}). If @var{coding} is @code{nil}, the default rules for finding the coding system will apply. @xref{Default Coding Systems}. -@item :connection-type @var{TYPE} +@item :connection-type @var{type} Initialize the type of device used to communicate with the subprocess. Possible values are @code{pty} to use a pty, @code{pipe} to use a pipe, or @code{nil} to use the default derived from the value of the diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index f37f75f..b6635dd 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -4572,7 +4572,7 @@ Return all nodes in @var{dom} that have IDs that match @var{match}, which is a regular expression. @item dom-strings @var{dom} -Return all strings in @var{DOM}. +Return all strings in @var{dom}. @end table diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 5b7bb0f..a9965a1 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -3999,14 +3999,14 @@ This function returns the pixel edges of @var{window}'s body. Calling the origin of the display screen rather than that of the frame: @defun window-absolute-pixel-edges &optional window -This function returns the pixel coordinates of @var{WINDOW} relative to +This function returns the pixel coordinates of @var{window} relative to an origin at (0, 0) of the display of @var{window}'s frame. Calling @code{(window-absolute-pixel-edges)} is equivalent to calling @code{(window-edges window nil t t)}, see above. @end defun @defun window-absolute-body-pixel-edges &optional window -This function returns the pixel coordinates of @var{WINDOW}'s body +This function returns the pixel coordinates of @var{window}'s body relative to an origin at (0, 0) of the display of @var{window}'s frame. Calling @code{(window-absolute-body-pixel-edges window)} is equivalent to calling @code{(window-edges window t t t)}, see above. commit 91aa5d19237fa54ff28abaa2ec07627b52e76a7f Author: Glenn Morris Date: Tue Nov 15 19:07:36 2016 -0500 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frames.texi (Size and Position): * doc/lispref/windows.texi (Window Sizes): Fix arglist typos. diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index a49bfc8..fbdc574 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -4179,12 +4179,12 @@ bar.) @var{horizontal-type} is either @code{bottom} or @code{nil} (which means no horizontal scroll bar). @end defun -@defun frame-scroll-bar-width &optional Lisp_Object &optional frame +@defun frame-scroll-bar-width &optional frame This function returns the width of vertical scroll bars of @var{frame} in pixels. @end defun -@defun frame-scroll-bar-height &optional Lisp_Object &optional frame +@defun frame-scroll-bar-height &optional frame This function returns the height of horizontal scroll bars of @var{frame} in pixels. @end defun diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 08f8594..ea7da08 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -764,7 +764,7 @@ its size using the @code{height} and @code{width} parameters with sizes and positions. For all of these functions the argument @var{frame} must denote a live frame and defaults to the selected frame. -@defun frame-position &optional Lisp_Object &optional frame +@defun frame-position &optional frame This function returns the outer position (@pxref{Frame Layout}) of @var{frame} in pixels. The value is a cons giving the coordinates of the top left corner of the outer frame of @var{frame} relative to an diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 78094e9..5b7bb0f 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -549,7 +549,7 @@ children. @cindex pixel width of a window @cindex total pixel width of a window -@defun window-pixel-width &optional Lisp_Object &optional window +@defun window-pixel-width &optional window This function returns the width of window @var{window} in pixels. @var{window} must be a valid window and defaults to the selected one. commit f758fcdb126689f4e640f0a4264b348d5995ce2d Author: Glenn Morris Date: Tue Nov 15 18:53:25 2016 -0500 * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --daemon. diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 881bf11..8db2ea1 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -327,18 +327,15 @@ setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}). @item -daemon @opindex -daemon -@itemx --daemon +@itemx --daemon[=@var{name}] @opindex --daemon Start Emacs as a daemon---after Emacs starts up, it starts the Emacs server and disconnects from the terminal without opening any frames. +(Optionally, you can specify an explicit @var{name} for the server.) You can then use the @command{emacsclient} command to connect to Emacs for editing. @xref{Emacs Server}, for information about using Emacs as a daemon. -@item -daemon=@var{SERVER-NAME} -Start emacs in background as a daemon, and use @var{SERVER-NAME} as -the server name. - @item --no-desktop @opindex --no-desktop Do not reload any saved desktop. @xref{Saving Emacs Sessions}. commit 5b0cddd91535025bbf0c69d17e2d4e470dd350c5 Author: Eli Zaretskii Date: Tue Nov 15 19:01:07 2016 +0200 More fixes in copyright notices in etc/refcards/ * etc/refcards/calccard.tex: * etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex: * etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex: * etc/refcards/dired-ref.tex: * etc/refcards/fr-dired-ref.tex: * etc/refcards/fr-refcard.tex: * etc/refcards/fr-survival.tex: * etc/refcards/orgcard.tex: * etc/refcards/pl-refcard.tex: * etc/refcards/pt-br-refcard.tex: * etc/refcards/refcard.tex: * etc/refcards/ru-refcard.tex: * etc/refcards/sk-dired-ref.tex: * etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex: * etc/refcards/survival.tex: * etc/refcards/vipcard.tex: * etc/refcards/viperCard.tex: Change "GNU Emacs" to "this document" in copyright notices. (Bug#24520) diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index 55933c7..bf486b5 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex @@ -22,7 +22,7 @@ % Copyright (C) 1987, 1992, 2001-2016 Free Software Foundation, Inc. -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -33,7 +33,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex index b2a46ca..d24e464 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-dired-ref.tex @@ -5,7 +5,7 @@ % Author: Evgeny Roubinchtein % Czech translation: Pavel Janík , March 2001 -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -16,7 +16,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex index a63592a..8e89c32 100644 --- a/etc/refcards/cs-refcard.tex +++ b/etc/refcards/cs-refcard.tex @@ -8,7 +8,7 @@ % Milan Zamazal , August 1999 % Pavel Janík , November 2000 (Emacs 21) -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -19,7 +19,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index 15bd900..a34c409 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -5,7 +5,7 @@ % Author: Wlodek Bzyl % Czech translation: Pavel Janík , March 2001 -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -16,7 +16,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex index 75f7491..9435d68 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex @@ -6,7 +6,7 @@ % Author: Stephen Gildea % German translation: Sven Joachim -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -17,7 +17,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex index 6936d2b..b691faf 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.tex @@ -4,7 +4,7 @@ % Author: Evgeny Roubinchtein -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -15,7 +15,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex index b74346c..cfbd9b4 100644 --- a/etc/refcards/fr-dired-ref.tex +++ b/etc/refcards/fr-dired-ref.tex @@ -5,7 +5,7 @@ % Author: Evgeny Roubinchtein % French translation: Eric Jacoboni -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -16,7 +16,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex index c6d853d..6d3acb3 100644 --- a/etc/refcards/fr-refcard.tex +++ b/etc/refcards/fr-refcard.tex @@ -7,7 +7,7 @@ % French translation: Eric Jacoboni % Micha\"el Cadilhac -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -18,7 +18,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex index 7a06bfb..ed3cafa 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex @@ -6,7 +6,7 @@ % Author: Wlodek Bzyl % French translation: \'Eric Jacoboni , November 2001 -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -17,7 +17,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 6d68da9..64a1403 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -20,7 +20,7 @@ % Copyright (C) 1987, 1993, 1996-1997, 2001-2016 Free Software % Foundation, Inc. -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -31,7 +31,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index ebb6d09..46091ea 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -6,7 +6,7 @@ % Author: Stephen Gildea % Polish translation: W{\l}odek Bzyl -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -17,7 +17,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex index 2126b78..ee15059 100644 --- a/etc/refcards/pt-br-refcard.tex +++ b/etc/refcards/pt-br-refcard.tex @@ -6,7 +6,7 @@ % Author: Stephen Gildea % Portuguese translation: Rodrigo Real -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -17,7 +17,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index 1677d25..4a3a5a7 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex @@ -5,7 +5,7 @@ % Author: Stephen Gildea -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -16,7 +16,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 052d843..f0b0bc1 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -3,7 +3,7 @@ % Author: Stephen Gildea % Russian translation: Alex Ott -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -14,7 +14,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex index deda693..90007d8 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex @@ -6,7 +6,7 @@ % Czech translation: Pavel Janík , March 2001 % Slovak translation: Miroslav Vasko , March 2001 -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -17,7 +17,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index 4037d9f..64982c6 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex @@ -9,7 +9,7 @@ % Pavel Janík , November 2000 (Emacs 21) % Slovak translation: Miroslav Vaško , March 2001 -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -20,7 +20,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index f0f61eb..5abcdc2 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -6,7 +6,7 @@ % Czech translation: Pavel Janík , March 2001 % Slovak translation: Miroslav Vasko , March 2001 -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -17,7 +17,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex index 50146fd..c5a3f9b 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex @@ -5,7 +5,7 @@ % Author: Wlodek Bzyl -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -16,7 +16,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex index c68133e..cb1e432 100644 --- a/etc/refcards/vipcard.tex +++ b/etc/refcards/vipcard.tex @@ -4,7 +4,7 @@ % Author: Masahiko Sato , -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -15,7 +15,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex index 2e57d7f..a22a655 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex @@ -6,7 +6,7 @@ % Aamod Sane (VIP 4.3) % Masahiko Sato (VIP 3.5) -% GNU Emacs is free software: you can redistribute it and/or modify +% This document 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. @@ -17,7 +17,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% This document 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. commit f994c2046588b168c1a4a900879cdffaf9d02f01 Author: Eli Zaretskii Date: Sun Nov 13 18:20:59 2016 +0200 Update copyright text in refcards * etc/refcards/viperCard.tex: * etc/refcards/vipcard.tex: * etc/refcards/survival.tex: * etc/refcards/sk-survival.tex: * etc/refcards/sk-dired-ref.tex: * etc/refcards/sk-refcard.tex: * etc/refcards/ru-refcard.tex: * etc/refcards/refcard.tex: * etc/refcards/pt-br-refcard.tex: * etc/refcards/pl-refcard.tex: * etc/refcards/orgcard.tex: * etc/refcards/gnus-refcard.tex: * etc/refcards/fr-survival.tex): * etc/refcards/fr-refcard.tex: * etc/refcards/fr-dired-ref.tex: * etc/refcards/dired-ref.tex: * etc/refcards/de-refcard.tex: * etc/refcards/cs-survival.tex: * etc/refcards/cs-refcard.tex: * etc/refcards/cs-dired-ref.tex: * etc/refcards/calccard.tex: Update the copyright blurb. (Bug#24520) diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index 5ca8207..55933c7 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex @@ -22,13 +22,17 @@ % Copyright (C) 1987, 1992, 2001-2016 Free Software Foundation, Inc. -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -75,9 +79,7 @@ \centerline{designed by Dave Gillespie and Stephen Gildea,} \centerline{for GNU Emacs Calc.} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. %For copies of the GNU Emacs Calc manual, write to the Free Software %Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex index d980170..b2a46ca 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-dired-ref.tex @@ -5,13 +5,17 @@ % Author: Evgeny Roubinchtein % Czech translation: Pavel Janík , March 2001 -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -57,9 +61,7 @@ \centerline{using refcard layout designed by Stephen Gildea.} \centerline{Translated by Pavel Janík.} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex index ecd7064..a63592a 100644 --- a/etc/refcards/cs-refcard.tex +++ b/etc/refcards/cs-refcard.tex @@ -8,13 +8,17 @@ % Milan Zamazal , August 1999 % Pavel Janík , November 2000 (Emacs 21) -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -74,9 +78,7 @@ \centerline{Designed by Stephen Gildea} \centerline{Translated by Jan Buchal, Milan Zamazal, Pavel Janík} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index bb38a91..15bd900 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -5,13 +5,17 @@ % Author: Wlodek Bzyl % Czech translation: Pavel Janík , March 2001 -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -63,9 +67,8 @@ W{\l}odek Bzyl (matwb@univ.gda.pl)\break Do češtiny přeložil Pavel Janík (Pavel@Janik.cz) - Kopie tohoto dokumentu můžete vytvářet a šířit - za předpokladu, že budou obsahovat tuto poznámku - o autorských právech.\par}} + Released under the terms of the GNU General Public License + version 3 or later.\par}} \hsize 3.2in \vsize 7.95in diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex index 748f9f8..75f7491 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex @@ -6,13 +6,17 @@ % Author: Stephen Gildea % German translation: Sven Joachim -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -75,10 +79,8 @@ \centerline{Entworfen von Stephen Gildea} % \centerline{deutsche \"Ubersetzung von Sven Joachim} -Es ist gestattet, ver\"anderte und unver\"anderte Kopien dieser -Karte her\-zu\-stellen und zu verbreiten, vorausgesetzt dass sich -der Copyright-Hinweis und der Hinweis auf diese Erlaubnis auf allen -Kopien befinden. +Released under the terms of the GNU General Public License +version 3 or later. F\"ur Kopien des Handbuchs zu GNU Emacs: diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex index cef3f46..6936d2b 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.tex @@ -4,13 +4,17 @@ % Author: Evgeny Roubinchtein -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -58,9 +62,7 @@ \centerline{Originally written May 2000 by Evgeny Roubinchtein,} \centerline{using refcard layout designed by Stephen Gildea.} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex index c430a97..b74346c 100644 --- a/etc/refcards/fr-dired-ref.tex +++ b/etc/refcards/fr-dired-ref.tex @@ -5,13 +5,17 @@ % Author: Evgeny Roubinchtein % French translation: Eric Jacoboni -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -51,9 +55,8 @@ \centerline{Mis \`a jour pour Dired en Mai 2000 par Evgeny Roubinchtein} \centerline{Traduction fran\c{c}aise d'\'Eric Jacoboni} -Vous pouvez faire et distribuer des copies de cette carte, pourvu que -la notice de copyright et cette note de permission soient pr\'eserv\'ees -sur toutes les copies. +Released under the terms of the GNU General Public License +version 3 or later. Pour obtenir des copies du manuel de GNU Emacs: diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex index e63d34f..c6d853d 100644 --- a/etc/refcards/fr-refcard.tex +++ b/etc/refcards/fr-refcard.tex @@ -7,13 +7,17 @@ % French translation: Eric Jacoboni % Micha\"el Cadilhac -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -72,9 +76,7 @@ \centerline{Traduction fran\c{c}aise de Micha\"el Cadilhac} % previously: Eric Jacoboni -Vous pouvez faire et distribuer des copies de cette carte, modifi\'ee ou -non, pourvu que la note de copyright et cette note de permission -soient conserv\'ees sur toutes les copies. +Released under the terms of the GNU General Public License version 3 or later. Pour des copies du manuel GNU Emacs: diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex index 1256de3..7a06bfb 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex @@ -6,13 +6,17 @@ % Author: Wlodek Bzyl % French translation: \'Eric Jacoboni , November 2001 -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -58,9 +62,8 @@ Auteur W{\l}odek Bzyl (matwb@univ.gda.pl)\break Traduction fran\c{c}aise \'Eric Jacoboni (jaco@teaser.fr) - Vous pouvez faire et distribuer des copies de cette carte, pourvu - que la note de copyright, ainsi que cette notice soient - pr\'eserv\'ees sur toutes les copies.\par}} + Released under the terms of the GNU General Public License + version 3 or later.\par}} \hsize 3.2in \vsize 7.95in diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex index d51e2ac..674c399 100644 --- a/etc/refcards/gnus-refcard.tex +++ b/etc/refcards/gnus-refcard.tex @@ -123,9 +123,9 @@ Copyright \copyright\ 1995, 2000, 2002--2016 Free Software Foundation, Inc.\\* \end{center} - Permission is granted to make and distribute copies of this reference - \guide{} provided the copyright notice and this permission are preserved on - all copies. Please send corrections, additions and suggestions to the + Released under the terms of the GNU General Public License version 3 or later. + + Please send corrections, additions and suggestions to the current maintainer's email address. \Guide{} last edited on \date. } diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 20df753..6d68da9 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -20,13 +20,17 @@ % Copyright (C) 1987, 1993, 1996-1997, 2001-2016 Free Software % Foundation, Inc. -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -73,9 +77,8 @@ \centerline{Author: Philip Rooke} \centerline{based on refcard design and format by Stephen Gildea} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +\centerline{Released under the terms of the GNU General Public License} +\centerline{version 3 or later.} \endgroup} diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index e4fbb6f..ebb6d09 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -6,13 +6,17 @@ % Author: Stephen Gildea % Polish translation: W{\l}odek Bzyl -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -84,9 +88,7 @@ \centerline{projekt Stephen Gildea} \centerline{t/lumaczenie W/lodek Bzyl} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex index c1b31f8..2126b78 100644 --- a/etc/refcards/pt-br-refcard.tex +++ b/etc/refcards/pt-br-refcard.tex @@ -6,13 +6,17 @@ % Author: Stephen Gildea % Portuguese translation: Rodrigo Real -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -77,9 +81,7 @@ \centerline{Designed by Stephen Gildea} \centerline{Translated by Rodrigo Real} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index a5c7419..1677d25 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex @@ -5,13 +5,17 @@ % Author: Stephen Gildea -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -75,9 +79,7 @@ \centerline{For GNU Emacs version \versionemacs} \centerline{Designed by Stephen Gildea} -Permission is granted to make and distribute modified or unmodified -copies of this card provided the copyright notice and this permission -notice are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 273a79c..052d843 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -3,6 +3,25 @@ % Author: Stephen Gildea % Russian translation: Alex Ott +% 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. + +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + +% 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 . + \documentclass[10pt]{article} \usepackage{multicol,tabularx} \usepackage[a4paper,hmargin={2cm,2cm},vmargin={2cm,2cm},nohead,twoside]{geometry} @@ -35,9 +54,7 @@ \centerline{Designed by Stephen Gildea} \centerline{Перевод Alex Ott } -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex index 7bd5ceb..deda693 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex @@ -6,13 +6,17 @@ % Czech translation: Pavel Janík , March 2001 % Slovak translation: Miroslav Vasko , March 2001 -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -58,9 +62,7 @@ \centerline{using refcard layout designed by Stephen Gildea.} \centerline{Translated by Miroslav Vaško.} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index 86f1919..4037d9f 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex @@ -9,13 +9,17 @@ % Pavel Janík , November 2000 (Emacs 21) % Slovak translation: Miroslav Vaško , March 2001 -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -75,9 +79,7 @@ \centerline{Designed by Stephen Gildea} \centerline{Translated by Miroslav Vaško} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index f8db101..f0f61eb 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -6,13 +6,17 @@ % Czech translation: Pavel Janík , March 2001 % Slovak translation: Miroslav Vasko , March 2001 -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -65,9 +69,8 @@ Do češtiny preložil Pavel Janík (Pavel@Janik.cz)\break Do slovenčiny preložil Miroslav Vaško (vasko@debian.cz) - Kópie tohto dokumentu môžete vytvárať a šíriť - za predpokladu, že budú obsahovať túto poznámku - o autorských právach.\par}} + Released under the terms of the GNU General Public License + version 3 or later.\par}} \hsize 3.2in \vsize 7.95in diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex index 02d310f..50146fd 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex @@ -5,13 +5,17 @@ % Author: Wlodek Bzyl -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -52,9 +56,8 @@ For GNU Emacs version \versionemacs\break Author W{\l}odek Bzyl (matwb@univ.gda.pl) - Permission is granted to make and distribute copies of - this card provided the copyright notice and this permission notice - are preserved on all copies.\par}} + Released under the terms of the GNU General Public License + version 3 or later.\par}} \hsize 3.2in \vsize 7.95in diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex index 942ec6c..c68133e 100644 --- a/etc/refcards/vipcard.tex +++ b/etc/refcards/vipcard.tex @@ -4,13 +4,17 @@ % Author: Masahiko Sato , -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -67,9 +71,7 @@ \centerline{Written by Masahiko Sato,} \centerline{using refcard layout designed by Stephen Gildea.} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex index 35528b1..2e57d7f 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex @@ -6,13 +6,17 @@ % Aamod Sane (VIP 4.3) % Masahiko Sato (VIP 3.5) -% 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. +% As a special additional permission, you may distribute reference cards +% printed, or formatted for printing, with the notice "Released under +% the terms of the GNU General Public License version 3 or later" +% instead of the usual distributed-under-the-GNU-GPL notice, and without +% a copy of the GPL itself. + % 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 @@ -71,9 +75,7 @@ \centerline{by Aamod Sane, VIP version 4.3} \centerline{by Masahiko Sato, VIP version 3.5} -Permission is granted to make and distribute copies of -this card provided the copyright notice and this permission notice -are preserved on all copies. +Released under the terms of the GNU General Public License version 3 or later. For copies of the GNU Emacs manual, see: commit 9ad2ae7757b96d5887c3c0547fcd62e558cadd23 Author: Eli Zaretskii Date: Sat Nov 12 21:40:33 2016 +0200 Fix Outline command names * doc/emacs/text.texi (Foldout): Use the outline-* names instead of the obsolete aliases. (Bug#24890) diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 064a545..f28488e 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1218,8 +1218,9 @@ levels. Consider an Outline mode buffer with all the text and subheadings under level-1 headings hidden. To look at what is hidden under one of these -headings, you could use @kbd{C-c C-e} (@kbd{M-x show-entry}) to expose -the body, or @kbd{C-c C-i} to expose the child (level-2) headings. +headings, you could use @kbd{C-c C-e} (@kbd{M-x outline-show-entry}) +to expose the body, or @kbd{C-c C-i} to expose the child (level-2) +headings. @kindex C-c C-z @findex foldout-zoom-subtree @@ -1234,11 +1235,12 @@ in the mode line shows how deep you've gone. When zooming in on a heading, to see only the child subheadings specify a numeric argument: @kbd{C-u C-c C-z}. The number of levels of children -can be specified too (compare @kbd{M-x show-children}), e.g., @kbd{M-2 -C-c C-z} exposes two levels of child subheadings. Alternatively, the -body can be specified with a negative argument: @kbd{M-- C-c C-z}. The -whole subtree can be expanded, similarly to @kbd{C-c C-s} (@kbd{M-x -show-subtree}), by specifying a zero argument: @kbd{M-0 C-c C-z}. +can be specified too (compare @kbd{M-x outline-show-children}), e.g., +@w{@kbd{M-2 C-c C-z}} exposes two levels of child subheadings. +Alternatively, the body can be specified with a negative argument: +@w{@kbd{M-- C-c C-z}}. The whole subtree can be expanded, similarly to +@kbd{C-c C-s} (@kbd{M-x outline-show-subtree}), by specifying a zero +argument: @w{@kbd{M-0 C-c C-z}}. While you're zoomed in, you can still use Outline mode's exposure and hiding functions without disturbing Foldout. Also, since the buffer is @@ -1255,8 +1257,8 @@ argument exits that many levels of folds. Specifying a zero argument exits all folds. To cancel the narrowing of a fold without hiding the text and -subheadings, specify a negative argument. For example, @kbd{M--2 C-c -C-x} exits two folds and leaves the text and subheadings exposed. +subheadings, specify a negative argument. For example, @w{@kbd{M--2 C-c +C-x}} exits two folds and leaves the text and subheadings exposed. Foldout mode also provides mouse commands for entering and exiting folds, and for showing and hiding text: commit 26c3554f88518266a95e228e941425302e25afe4 Author: Philipp Stephani Date: Sun Nov 6 19:21:10 2016 +0100 Send text received by bracketed paste to process See Bug#24639. * term.el (term--xterm-paste): New function. (term-raw-map): Use it. (xterm--pasted-text): Declare function from xterm.el. diff --git a/lisp/term.el b/lisp/term.el index 993e580..18d6775 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -845,6 +845,7 @@ is buffer-local." (define-key map [S-insert] 'term-paste) (define-key map [prior] 'term-send-prior) (define-key map [next] 'term-send-next) + (define-key map [xterm-paste] #'term--xterm-paste) map) "Keyboard map for sending characters directly to the inferior process.") @@ -1211,6 +1212,13 @@ without any interpretation." (interactive) (term-send-raw-string (current-kill 0))) +(defun term--xterm-paste () + "Insert the text pasted in an XTerm bracketed paste operation." + (interactive) + (term-send-raw-string (xterm--pasted-text))) + +(declare-function xterm--pasted-text "term/xterm" ()) + ;; Which would be better: "\e[A" or "\eOA"? readline accepts either. ;; For my configuration it's definitely better \eOA but YMMV. -mm ;; For example: vi works with \eOA while elm wants \e[A ... commit db0b58da1d1e5724c783550103fcf5bb363bb713 Author: Alan Mackenzie Date: Thu Nov 10 21:22:05 2016 +0000 Correct the statement about programming modes always running prog-mode-hook. doc/emacs/modes.texi (Major Modes): Amend the statement about programming modes running prog-mode-hook to say that it applies to many (not all) such modes, and specifying exactly which modes. diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index c1564e9..63e31ab 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi @@ -113,10 +113,13 @@ hook}, a customizable list of Lisp functions to run each time the mode is enabled in a buffer. @xref{Hooks}, for more information about hooks. Each mode hook is named after its major mode, e.g., Fortran mode has @code{fortran-mode-hook}. Furthermore, all text-based major -modes run @code{text-mode-hook}, and all programming language modes -run @code{prog-mode-hook}, prior to running their own mode hooks. -Hook functions can look at the value of the variable @code{major-mode} -to see which mode is actually being entered. +modes run @code{text-mode-hook}, and many programming language modes +@footnote{More specifically, the modes which are ''derived'' from +@code{prog-mode} (@pxref{Derived Modes,,, elisp, The Emacs Lisp +Reference Manual}).} (including all those distributed with Emacs) run +@code{prog-mode-hook}, prior to running their own mode hooks. Hook +functions can look at the value of the variable @code{major-mode} to +see which mode is actually being entered. Mode hooks are commonly used to enable minor modes (@pxref{Minor Modes}). For example, you can put the following lines in your init commit 78aece497ce9dc784d5e3d2707d76766eed2a174 Author: Eli Zaretskii Date: Thu Nov 10 18:25:21 2016 +0200 Improve documentation of 'occur' * doc/emacs/search.texi (Other Repeating Search): Clarify how to use Occur with search strings from last Isearch. (Bug#24890) diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index b41214d..543d547 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1714,15 +1714,21 @@ a multi-file incremental search is activated automatically. @cindex mode, Occur @cindex match (face name) @vindex list-matching-lines-default-context-lines +@kindex M-s o @item M-x occur +@itemx M-s o Prompt for a regexp, and display a list showing each line in the -buffer that contains a match for it. The text that matched is -highlighted using the @code{match} face. To limit the search to part -of the buffer, narrow to that part (@pxref{Narrowing}). A numeric -argument @var{n} specifies that @var{n} lines of context are to be -displayed before and after each matching line. The default number of -context lines is specified by the variable -@code{list-matching-lines-default-context-lines}. +buffer that contains a match for it. If you type @kbd{M-n} at the +prompt, you can reuse search strings from previous incremental +searches. The text that matched is highlighted using the @code{match} +face. To limit the search to part of the buffer, narrow to that part +(@pxref{Narrowing}). A numeric argument @var{n} specifies that +@var{n} lines of context are to be displayed before and after each +matching line. The default number of context lines is specified by +the variable @code{list-matching-lines-default-context-lines}. + +You can also run @kbd{M-s o} when an incremental search is active; +this uses the current search string. @kindex RET @r{(Occur mode)} @kindex o @r{(Occur mode)} @@ -1744,12 +1750,6 @@ mode. The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x occur}. -@kindex M-s o -@item M-s o -Run @code{occur} using the search string of the last incremental -string search. You can also run @kbd{M-s o} when an incremental -search is active; this uses the current search string. - @item M-x multi-occur This command is just like @code{occur}, except it is able to search through multiple buffers. It asks you to specify the buffer names one commit eb364fddec1431f459166cebb36f09f6b371dd71 Author: Noam Postavsky Date: Mon Nov 7 20:03:48 2016 -0500 Do call debugger on failed cl-assert "Don't call debug on failed cl-assert..." removed the call to `debug' in cl--assertion-failed because `debug' calls `kill-emacs' in batch mode, thus messing up ert test runs. However, calling the debugger is useful because it allows catching failed assertions even inside `condition-case' calls. The problem with ert can be avoided by calling `debugger' instead of `debug' directly, since ert installs its own debugger while running tests. * lisp/emacs-lisp/cl-preloaded.el (cl--assertion-failed): Call `debugger' if `debug-on-error' is non-nil. diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index 639ffa6..2b022c4 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -44,9 +44,11 @@ (define-error 'cl-assertion-failed (purecopy "Assertion failed")) (defun cl--assertion-failed (form &optional string sargs args) - (if string - (apply #'error string (append sargs args)) - (signal 'cl-assertion-failed `(,form ,@sargs)))) + (if debug-on-error + (funcall debugger `(cl-assertion-failed ,form ,string ,@sargs)) + (if string + (apply #'error string (append sargs args)) + (signal 'cl-assertion-failed `(,form ,@sargs))))) ;; When we load this (compiled) file during pre-loading, the cl--struct-class ;; code below will need to access the `cl-struct' info, since it's considered commit 3ef4ee84fa3f658c2df802569dc89023d98e9947 Author: Daniel Colascione Date: Tue Nov 8 15:26:43 2016 -0800 Avoid infloop in python Fix bug#24905 * lisp/progmodes/python.el (python-info-docstring-p): Improve infloop avoidance: replace (bobp) with generic test for forward progress. * test/lisp/progmodes/python-tests.el (python-bob-infloop-avoid): Add test for bug#24905 diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 9091289..d0d4a7f 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -4865,12 +4865,19 @@ point's current `syntax-ppss'." ;; Allow up to two consecutive docstrings only. (>= 2 - (progn + (let (last-backward-sexp-point) (while (save-excursion (python-nav-backward-sexp) (setq backward-sexp-point (point)) (and (= indentation (current-indentation)) - (not (bobp)) ; Prevent infloop. + ;; Make sure we're always moving point. + ;; If we get stuck in the same position + ;; on consecutive loop iterations, + ;; bail out. + (prog1 (not (eql last-backward-sexp-point + backward-sexp-point)) + (setq last-backward-sexp-point + backward-sexp-point)) (looking-at-p (concat "[uU]?[rR]?" (python-rx string-delimiter))))) diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el index 54ed922..f6564dd 100644 --- a/test/automated/python-tests.el +++ b/test/automated/python-tests.el @@ -2452,6 +2452,13 @@ if x: (line-beginning-position) (line-end-position)) "abcdef"))))) +(ert-deftest python-bob-infloop-avoid () + "Test that strings at BOB don't confuse syntax analysis. Bug#24905" + (python-tests-with-temp-buffer + " \"\n" + (goto-char (point-min)) + (font-lock-fontify-buffer))) + ;;; Shell integration commit 8da810f91b11a258a7ed0f5315292143072881d8 Author: Eli Zaretskii Date: Mon Nov 7 19:39:54 2016 +0200 Don't refer to obsolete FEATURE-unload-hook * doc/lispref/tips.texi (Coding Conventions): Refer to FEATURE-unload-function rather than its obsolete variant FEATURE-unload-hook. (Bug#24890) diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index d12de7a..1ba9ad9 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -165,10 +165,10 @@ follow the naming conventions for hooks. @xref{Hooks}. @item @cindex unloading packages, preparing for If loading the file adds functions to hooks, define a function -@code{@var{feature}-unload-hook}, where @var{feature} is the name of -the feature the package provides, and make it undo any such changes. -Using @code{unload-feature} to unload the file will run this function. -@xref{Unloading}. +@code{@var{feature}-unload-function}, where @var{feature} is the name +of the feature the package provides, and make it undo any such +changes. Using @code{unload-feature} to unload the file will run this +function. @xref{Unloading}. @item It is a bad idea to define aliases for the Emacs primitives. Normally commit 4f478ca04be6d9b87b25e0a16a6beef300504fb1 Author: Eli Zaretskii Date: Mon Nov 7 19:34:51 2016 +0200 Improve documentation of dabbrevs * lisp/dabbrev.el (dabbrev-expand): Doc fix. (Bug#24890) * doc/emacs/abbrevs.texi (Dynamic Abbrevs): Mention 'dabbrev-check-all-buffers', 'dabbrev-check-other-buffers', and 'dabbrev-ignored-buffer-names' and their purpose. (Bug#24890) diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi index a1db34c..227fe6f 100644 --- a/doc/emacs/abbrevs.texi +++ b/doc/emacs/abbrevs.texi @@ -341,7 +341,7 @@ abbrev expansion happens only when you request it explicitly. @table @kbd @item M-/ Expand the word in the buffer before point as a @dfn{dynamic abbrev}, -by searching in the buffer for words starting with that abbreviation +by searching for words starting with that abbreviation (@code{dabbrev-expand}). @item C-M-/ @@ -361,14 +361,19 @@ The variable @code{dabbrev-limit}, if non-@code{nil}, specifies how far away in the buffer to search for an expansion. @vindex dabbrev-check-all-buffers +@vindex dabbrev-check-other-buffers After scanning the current buffer, @kbd{M-/} normally searches other -buffers, unless you have set @code{dabbrev-check-all-buffers} to -@code{nil}. +buffers. The variables @code{dabbrev-check-all-buffers} and +@code{dabbrev-check-other-buffers} can be used to determine which +other buffers, if any, are searched. +@vindex dabbrev-ignored-buffer-names @vindex dabbrev-ignored-buffer-regexps - For finer control over which buffers to scan, customize the variable -@code{dabbrev-ignored-buffer-regexps}. Its value is a list of regular -expressions. If a buffer's name matches any of these regular + For finer control over which buffers to scan, customize the +variables @code{dabbrev-ignored-buffer-names} and +@code{dabbrev-ignored-buffer-regexps}. The value of the former is a +list of buffer names to skip. The value of the latter is a list of +regular expressions; if a buffer's name matches any of these regular expressions, dynamic abbrev expansion skips that buffer. A negative argument to @kbd{M-/}, as in @kbd{C-u - M-/}, says to diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index d9f36b1..438eda3 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -433,7 +433,10 @@ Expands to the most recent, preceding word for which this is a prefix. If no suitable preceding word is found, words following point are considered. If still no suitable word is found, then look in the buffers accepted by the function pointed out by variable -`dabbrev-friend-buffer-function'. +`dabbrev-friend-buffer-function', if `dabbrev-check-other-buffers' +says so. Then, if `dabbrev-check-all-buffers' is non-nil, look in +all the other buffers, subject to constraints specified +by `dabbrev-ignored-buffer-names' and `dabbrev-ignored-regexps'. A positive prefix argument, N, says to take the Nth backward *distinct* possibility. A negative argument says search forward. commit 7272e5db22ab157389fcaa8a187b78e883c1f4c2 Author: Eli Zaretskii Date: Mon Nov 7 19:09:19 2016 +0200 * lisp/chistory.el (list-command-history): Doc fix. (Bug#24890) diff --git a/lisp/chistory.el b/lisp/chistory.el index 6f8a74b..be53937 100644 --- a/lisp/chistory.el +++ b/lisp/chistory.el @@ -95,7 +95,7 @@ from the command history." ;;;###autoload (defun list-command-history () - "List history of commands typed to minibuffer. + "List history of commands that used the minibuffer. The number of commands listed is controlled by `list-command-history-max'. Calls value of `list-command-history-filter' (if non-nil) on each history element to judge if that element should be excluded from the list. commit 89b74829145d5646c3ab4aafaeb9e124fba04255 Author: Eli Zaretskii Date: Mon Nov 7 19:04:19 2016 +0200 * lisp/simple.el (set-mark-command): Doc fix. (Bug#24890) diff --git a/lisp/simple.el b/lisp/simple.el index ff5774e..dd2f065 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5403,13 +5403,13 @@ after C-u \\[set-mark-command]." :group 'editing-basics) (defun set-mark-command (arg) - "Set the mark where point is, or jump to the mark. + "Set the mark where point is, and activate it; or jump to the mark. Setting the mark also alters the region, which is the text between point and mark; this is the closest equivalent in Emacs to what some editors call the \"selection\". With no prefix argument, set the mark at point, and push the -old mark position on local mark ring. Also push the old mark on +old mark position on local mark ring. Also push the new mark on global mark ring, if the previous mark was set in another buffer. When Transient Mark Mode is off, immediately repeating this commit 3b199f7c77906f13a778b38a3b5fcdfb59a56ceb Author: Eli Zaretskii Date: Mon Nov 7 18:57:28 2016 +0200 Improve documentation of some Help commands * doc/emacs/help.texi (Help Mode): Fix mistake in key sequences. Mention the 'l' and 'r' keys. (Misc Help): Mention that 'C-h m' describes key bindings. (Bug#24890) diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index 4b7b7fc..64da890 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -411,8 +411,10 @@ Follow a hyperlink that you click on. Show all documentation about the symbol at point (@code{help-follow-symbol}). @item C-c C-f +@itemx r Go forward to the next help topic (@code{help-go-forward}). @item C-c C-b +@itemx l Go back to the previous help topic (@code{help-go-back}). @end table @@ -422,15 +424,18 @@ Go back to the previous help topic (@code{help-go-back}). @findex help-go-forward @kindex RET @r{(Help mode)} @kindex C-c C-b @r{(Help mode)} +@kindex l @r{(Help mode)} @kindex C-c C-f @r{(Help mode)} +@kindex r @r{(Help mode)} When a function name, variable name, or face name (@pxref{Faces}) appears in the documentation in the help buffer, it is normally an underlined @dfn{hyperlink}. To view the associated documentation, move point there and type @key{RET} (@code{help-follow}), or click on the hyperlink with @kbd{mouse-1} or @kbd{mouse-2}. Doing so replaces the contents of the help buffer; to retrace your steps, type @kbd{C-c -C-b} (@code{help-go-back}). While retracing your steps, you can go -forward by using @kbd{C-c C-b} (@code{help-go-forward}). +C-b} or @kbd{l} (@code{help-go-back}). While retracing your steps, +you can go forward by using @kbd{C-c C-f} or @kbd{r} +(@code{help-go-forward}). @cindex URL, viewing in help @cindex help, viewing web pages @@ -556,7 +561,8 @@ commands that you are not familiar with, you can use @kbd{C-h k} or Each Emacs major mode typically redefines a few keys and makes other changes in how editing works. @kbd{C-h m} (@code{describe-mode}) displays documentation on the current major mode, which normally -describes the commands and features that are changed in this mode. +describes the commands and features that are changed in this mode, and +also its key bindings. @kindex C-h b @findex describe-bindings commit 93d3a0e3025c0b939856a75c45494c41c6d357d9 Author: Eli Zaretskii Date: Mon Nov 7 18:47:39 2016 +0200 Fix documentation of yes-or-no prompts * doc/emacs/mini.texi (Yes or No Prompts): Fix mistakes in key sequences. (Bug#24890) diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 444c8a7..7c97e42 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -788,8 +788,8 @@ File ‘foo.el’ exists; overwrite? (y or n) Because this query does not actually use the minibuffer, the usual minibuffer editing commands cannot be used. However, you can perform some window scrolling operations while the query is active: @kbd{C-l} -recenters the selected window; @kbd{M-v} (or @key{PageDown} or -@key{next}) scrolls forward; @kbd{C-v} (or @key{PageUp}, or +recenters the selected window; @kbd{C-v} (or @key{PageDown} or +@key{next}) scrolls forward; @kbd{M-v} (or @key{PageUp}, or @key{prior}) scrolls backward; @kbd{C-M-v} scrolls forward in the next window; and @kbd{C-M-S-v} scrolls backward in the next window. Typing @kbd{C-g} dismisses the query, and quits the command that issued it @@ -811,5 +811,5 @@ Buffer foo.el modified; kill anyway? (yes or no) To answer, you must type @samp{yes} or @samp{no} into the minibuffer, followed by @key{RET}. The minibuffer behaves as described in the previous sections; you can switch to another window with @kbd{C-x o}, -use the history commands @kbd{M-p} and @kbd{M-f}, etc. Type @kbd{C-g} +use the history commands @kbd{M-p} and @kbd{M-n}, etc. Type @kbd{C-g} to quit the minibuffer and the querying command. commit af04919fc5987eabcd52c39b66649f7cd1a90d0e Author: Eli Zaretskii Date: Mon Nov 7 18:44:17 2016 +0200 Fix documentation of partial completion style * doc/emacs/mini.texi (Completion Styles): Fix the description of the wildcard '*'. (Bug#24890) diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index be4206c..444c8a7 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -469,8 +469,8 @@ separately. (For example, when completing command names, @samp{em-l-m} completes to @samp{emacs-lisp-mode}.) Furthermore, a @samp{*} in the minibuffer text is treated as a -@dfn{wildcard}---it matches any character at the corresponding -position in the completion alternative. +@dfn{wildcard}---it matches any string of characters at the +corresponding position in the completion alternative. @item emacs22 This completion style is similar to @code{basic}, except that it commit ed80184d0c837cdaeda1c73f71d8d0aea33fae10 Author: Eli Zaretskii Date: Mon Nov 7 18:23:54 2016 +0200 Fix documentation of the mode line on emacsclient frames * doc/emacs/screen.texi (Mode Line): Document the '@' indicator on emacsclient frames. diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi index 7165757..46ccca5 100644 --- a/doc/emacs/screen.texi +++ b/doc/emacs/screen.texi @@ -216,6 +216,11 @@ changes to either a forward slash (@samp{/}) or @samp{(Mac)}. On some systems, Emacs displays @samp{(Unix)} instead of the colon for files that use newline as the line separator. + On frames created for @command{emacsclient} (@pxref{Invoking +emacsclient}), the next character is @samp{@@}. This indication is +typical for frames of an Emacs process running as a daemon +(@pxref{Emacs Server}). + The next element on the mode line is the string indicated by @var{ch}. This shows two dashes (@samp{--}) if the buffer displayed in the window has the same contents as the corresponding file on the @@ -225,7 +230,7 @@ shows @samp{%*} if the buffer is modified, and @samp{%%} otherwise. The character after @var{ch} is normally a dash (@samp{-}). However, if the default-directory for the current buffer is on a -remote machine, @samp{@@} is displayed instead (@pxref{File Names}). +remote machine (@pxref{File Names}), @samp{@@} is displayed instead. @var{fr} gives the selected frame name (@pxref{Frames}). It appears only on text terminals. The initial frame's name is @samp{F1}. commit e6be8557d5b54d733529ff020434471a47528481 Author: Eli Zaretskii Date: Mon Nov 7 18:00:19 2016 +0200 Fix description of 'C-z' in User manual * doc/emacs/entering.texi (Exiting): 'C-z' is bound to 'suspend-frame'. (Bug#24890) diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index 66817e3..d6cb3cb 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -100,7 +100,7 @@ display them initially. Kill Emacs (@code{save-buffers-kill-terminal}). @item C-z On a text terminal, suspend Emacs; on a graphical display, -iconify (or ``minimize'') the selected frame (@code{suspend-emacs}). +iconify (or ``minimize'') the selected frame (@code{suspend-frame}). @end table @kindex C-x C-c commit 16f700702c681989b04c1899b17a0f022d3b0125 Author: Eli Zaretskii Date: Mon Nov 7 17:55:42 2016 +0200 Improve and clarify documentation of Outline Mode * doc/emacs/text.texi (Outline Visibility): Use the outline-* names instead of the obsolete aliases. (Bug#24890) * lisp/outline.el (outline-hide-sublevels, outline-hide-other) (outline-hide-body): Doc fixes. (Bug#24890) diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 7fa0804..064a545 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1078,92 +1078,101 @@ header line. @table @kbd @item C-c C-c -Make the current heading line's body invisible (@code{hide-entry}). +Make the current heading line's body invisible +(@code{outline-hide-entry}). @item C-c C-e -Make the current heading line's body visible (@code{show-entry}). +Make the current heading line's body visible +(@code{outline-show-entry}). @item C-c C-d Make everything under the current heading invisible, not including the -heading itself (@code{hide-subtree}). +heading itself (@code{outline-hide-subtree}). @item C-c C-s Make everything under the current heading visible, including body, -subheadings, and their bodies (@code{show-subtree}). +subheadings, and their bodies (@code{outline-show-subtree}). @item C-c C-l Make the body of the current heading line, and of all its subheadings, -invisible (@code{hide-leaves}). +invisible (@code{outline-hide-leaves}). @item C-c C-k Make all subheadings of the current heading line, at all levels, -visible (@code{show-branches}). +visible (@code{outline-show-branches}). @item C-c C-i Make immediate subheadings (one level down) of the current heading -line visible (@code{show-children}). +line visible (@code{outline-show-children}). @item C-c C-t -Make all body lines in the buffer invisible (@code{hide-body}). +Make all body lines in the buffer invisible +(@code{outline-hide-body}). @item C-c C-a -Make all lines in the buffer visible (@code{show-all}). +Make all lines in the buffer visible (@code{outline-show-all}). @item C-c C-q Hide everything except the top @var{n} levels of heading lines -(@code{hide-sublevels}). +(@code{outline-hide-sublevels}). @item C-c C-o Hide everything except for the heading or body that point is in, plus the headings leading up from there to the top level of the outline -(@code{hide-other}). +(@code{outline-hide-other}). @end table -@findex hide-entry -@findex show-entry +@findex outline-hide-entry +@findex outline-show-entry @kindex C-c C-c @r{(Outline mode)} @kindex C-c C-e @r{(Outline mode)} The simplest of these commands are @kbd{C-c C-c} -(@code{hide-entry}), which hides the body lines directly following the -current heading line, and @kbd{C-c C-e} (@code{show-entry}), which -reveals them. Subheadings and their bodies are not affected. +(@code{outline-hide-entry}), which hides the body lines directly +following the current heading line, and @kbd{C-c C-e} +(@code{outline-show-entry}), which reveals them. Subheadings and +their bodies are not affected. -@findex hide-subtree -@findex show-subtree +@findex outline-hide-subtree +@findex outline-show-subtree @kindex C-c C-s @r{(Outline mode)} @kindex C-c C-d @r{(Outline mode)} @cindex subtree (Outline mode) - The commands @kbd{C-c C-d} (@code{hide-subtree}) and @kbd{C-c C-s} -(@code{show-subtree}) are more powerful. They apply to the current -heading line's @dfn{subtree}: its body, all of its subheadings, both -direct and indirect, and all of their bodies. - -@findex hide-leaves -@findex show-branches -@findex show-children + The commands @kbd{C-c C-d} (@code{outline-hide-subtree}) and +@kbd{C-c C-s} (@code{outline-show-subtree}) are more powerful. They +apply to the current heading line's @dfn{subtree}: its body, all of +its subheadings, both direct and indirect, and all of their bodies. + +@findex outline-hide-leaves +@findex outline-show-branches +@findex outline-show-children @kindex C-c C-l @r{(Outline mode)} @kindex C-c C-k @r{(Outline mode)} @kindex C-c C-i @r{(Outline mode)} - The command @kbd{C-c C-l} (@code{hide-leaves}) hides the body of the -current heading line as well as all the bodies in its subtree; the -subheadings themselves are left visible. The command @kbd{C-c C-k} -(@code{show-branches}) reveals the subheadings, if they had previously -been hidden (e.g., by @kbd{C-c C-d}). The command @kbd{C-c C-i} -(@code{show-children}) is a weaker version of this; it reveals just -the direct subheadings, i.e., those one level down. - -@findex hide-other + The command @kbd{C-c C-l} (@code{outline-hide-leaves}) hides the +body of the current heading line as well as all the bodies in its +subtree; the subheadings themselves are left visible. The command +@kbd{C-c C-k} (@code{outline-show-branches}) reveals the subheadings, +if they had previously been hidden (e.g., by @kbd{C-c C-d}). The +command @kbd{C-c C-i} (@code{outline-show-children}) is a weaker +version of this; it reveals just the direct subheadings, i.e., those +one level down. + +@findex outline-hide-other @kindex C-c C-o @r{(Outline mode)} - The command @kbd{C-c C-o} (@code{hide-other}) hides everything -except the entry that point is in, plus its parents (the headers -leading up from there to top level in the outline) and the top level -headings. - -@findex hide-body -@findex show-all + The command @kbd{C-c C-o} (@code{outline-hide-other}) hides +everything except the entry that point is in, plus its parents (the +headers leading up from there to top level in the outline) and the top +level headings. It also reveals body lines preceding the first +heading in the buffer. + +@findex outline-hide-body +@findex outline-show-all @kindex C-c C-t @r{(Outline mode)} @kindex C-c C-a @r{(Outline mode)} @findex hide-sublevels @kindex C-c C-q @r{(Outline mode)} The remaining commands affect the whole buffer. @kbd{C-c C-t} -(@code{hide-body}) makes all body lines invisible, so that you see -just the outline structure (as a special exception, it will not hide -lines at the top of the file, preceding the first header line, even -though these are technically body lines). @kbd{C-c C-a} -(@code{show-all}) makes all lines visible. @kbd{C-c C-q} -(@code{hide-sublevels}) hides all but the top level headings; with a -numeric argument @var{n}, it hides everything except the top @var{n} -levels of heading lines. +(@code{outline-hide-body}) makes all body lines invisible, so that you +see just the outline structure (as a special exception, it will not +hide lines at the top of the file, preceding the first header line, +even though these are technically body lines). @kbd{C-c C-a} +(@code{outline-show-all}) makes all lines visible. @kbd{C-c C-q} +(@code{outline-hide-sublevels}) hides all but the top level headings +at and above the level of the current heading line (defaulting to 1 if +point is not on a heading); with a numeric argument @var{n}, it hides +everything except the top @var{n} levels of heading lines. Note that +it completely reveals all the @var{n} top levels and the body lines +before the first heading. @anchor{Outline Search} @findex reveal-mode diff --git a/lisp/outline.el b/lisp/outline.el index 2001cdf..f94dbb9 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -788,7 +788,8 @@ Show the heading too, if it is currently invisible." 'show-entry 'outline-show-entry "25.1") (defun outline-hide-body () - "Hide all body lines in buffer, leaving all headings visible." + "Hide all body lines in buffer, leaving all headings visible. +Note that this does not hide the lines preceding the first heading line." (interactive) (outline-hide-region-body (point-min) (point-max))) @@ -868,7 +869,12 @@ Show the heading too, if it is currently invisible." nil)) (defun outline-hide-sublevels (levels) - "Hide everything but the top LEVELS levels of headers, in whole buffer." + "Hide everything but the top LEVELS levels of headers, in whole buffer. +This also unhides the top heading-less body, if any. + +Interactively, the prefix argument supplies the value of LEVELS. +When invoked without a prefix argument, LEVELS defaults to the level +of the current heading, or to 1 if the current line is not a heading." (interactive (list (cond (current-prefix-arg (prefix-numeric-value current-prefix-arg)) @@ -909,7 +915,8 @@ Show the heading too, if it is currently invisible." 'hide-sublevels 'outline-hide-sublevels "25.1") (defun outline-hide-other () - "Hide everything except current body and parent and top-level headings." + "Hide everything except current body and parent and top-level headings. +This also unhides the top heading-less body, if any." (interactive) (outline-hide-sublevels 1) (let (outline-view-change-hook) commit 31d93aa1d533cf9542f2136b96bad95d0997465d Author: Eli Zaretskii Date: Sun Nov 6 18:58:03 2016 +0200 Add Emacs version number to nt/README.W32 * nt/README.W32: Include the version number of the latest Emacs release. * admin/admin.el (set-version): Update the version in nt/README.W32. diff --git a/admin/admin.el b/admin/admin.el index 4af1ff9..9f3b68e 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -109,6 +109,9 @@ Root must be the root of an Emacs source tree." (rx (and "AC_INIT" (1+ (not (in ?,))) ?, (0+ space) (submatch (1+ (in "0-9.")))))) + (set-version-in-file root "nt/README.W32" version + (rx (and "version" (1+ space) + (submatch (1+ (in "0-9.")))))) ;; TODO: msdos could easily extract the version number from ;; configure.ac with sed, rather than duplicating the information. (set-version-in-file root "msdos/sed2v2.inp" version diff --git a/nt/README.W32 b/nt/README.W32 index 7ffeb0a..b65a1de 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,11 +1,12 @@ Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs for MS-Windows + Emacs version 25.1.50 for MS-Windows This README file describes how to set up and run a precompiled - distribution of GNU Emacs for MS-Windows. You can find the - precompiled distribution on the ftp.gnu.org server and its mirrors: + distribution of the latest version of GNU Emacs for MS-Windows. You + can find the precompiled distribution on the ftp.gnu.org server and + its mirrors: ftp://ftp.gnu.org/gnu/emacs/windows/ commit 0b6b8151186e2d8d48aff8182a66aee21a6edb53 Author: Noam Postavsky Date: Tue Nov 1 23:24:33 2016 -0400 Fix python-mode hideshow regexp 2015-02-07 "Fix hideshow integration[...]" changed the regexp added to `hs-special-modes-alist' so that it worked when not searching from the beginning of the line. However, this allows matching tokens ending in "def" or "class", not just those keywords. This results in an infinite loop in hs-hide-all (Bug #24815). * lisp/progmodes/python.el (python-mode): Add symbol boundaries around the def|class matching part of the regexp added to hs-special-modes-alist. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 8ec9feb..9091289 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -5136,7 +5136,7 @@ returned as is." (add-to-list 'hs-special-modes-alist `(python-mode - "\\s-*\\(?:def\\|class\\)\\>" + "\\s-*\\_<\\(?:def\\|class\\)\\_>" ;; Use the empty string as end regexp so it doesn't default to ;; "\\s)". This way parens at end of defun are properly hidden. "" commit dc152c54f4e44f5f2040883b03f71ff6aa66c893 Author: Paul Eggert Date: Sun Nov 6 00:33:43 2016 -0700 Modernize usage of 'macOS' in doc and comments Apple changed the spelling of its operating system again, to "macOS", effective with macOS 10.12 Sierra (2016-09-20). Change Emacs documentation and comments to match this. Stick with older OS spellings ("OS X", "Mac OS X") when talking about older releases where the older names are more correct. diff --git a/INSTALL b/INSTALL index 119b4d4..ade9bcb 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ See the end of the file for license conditions. This file contains general information on building GNU Emacs. -For more information specific to the MS-Windows, GNUstep/Mac OS X, and +For more information specific to the MS-Windows, GNUstep/macOS, and MS-DOS ports, also read the files nt/INSTALL, nextstep/INSTALL, and msdos/INSTALL. For information about building from a repository checkout (rather than a release), also read the file INSTALL.REPO. @@ -208,7 +208,7 @@ corresponding command is 'yum-builddep emacs'. DETAILED BUILDING AND INSTALLATION: -(This is for a Unix or Unix-like system. For GNUstep and Mac OS X, +(This is for a Unix or Unix-like system. For GNUstep and macOS, see nextstep/INSTALL. For non-ancient versions of MS Windows, see the file nt/INSTALL. For MS-DOS and MS Windows 3.X, see msdos/INSTALL.) diff --git a/Makefile.in b/Makefile.in index b3f7edb..9600c11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -113,7 +113,7 @@ am__v_at_1 = # ==================== Where To Install Things ==================== -# Location to install Emacs.app under GNUstep / Mac OS X. +# Location to install Emacs.app under GNUstep / macOS. # Later values may use these. ns_appbindir=@ns_appbindir@ ns_appresdir=@ns_appresdir@ diff --git a/README b/README index 35a31db..d227ec5 100644 --- a/README +++ b/README @@ -86,9 +86,8 @@ There are several subdirectories: in Emacs Lisp manual. 'msdos' holds configuration files for compiling Emacs under MS-DOS. 'nextstep' holds instructions and some other files for compiling the - Nextstep port of Emacs, for GNUstep and Mac OS X Cocoa. -'nt' holds various command files and documentation files that pertain - to building and running Emacs on Windows 9X/ME/NT/2000/XP. + Nextstep port of Emacs, for GNUstep and macOS Cocoa. +'nt' holds code and documentation for building Emacs on MS-Windows. 'test' holds tests for various aspects of Emacs's functionality. Building Emacs on non-Posix platforms requires tools that aren't part diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 796b57d..cf83603 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -22,7 +22,7 @@ WINDOWSNT Compiling the native MS-Windows (W32) port. __MINGW32__ Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC. _MSC_VER Compiling the W32 port with the Microsoft C compiler. MINGW_W64 Compiling the W32 port with the MinGW-w64 port of GCC. -DARWIN_OS Compiling on Mac OS X or pure Darwin (and using s/darwin.h). +DARWIN_OS Compiling on macOS or pure Darwin (and using s/darwin.h). SOLARIS2 USG USG5_4 @@ -30,7 +30,7 @@ USG5_4 ** Distinguishing GUIs ** HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars. -HAVE_NS Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep. +HAVE_NS Use the NeXT/OpenStep/Cocoa UI under macOS or GNUstep. NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API. NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. HAVE_X11 Compile support for the X11 GUI. diff --git a/configure.ac b/configure.ac index 19b44bd..9f12a2b 100644 --- a/configure.ac +++ b/configure.ac @@ -342,8 +342,8 @@ OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars]) OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d]) OPTION_DEFAULT_ON([xim],[don't use X11 XIM]) AC_ARG_WITH([ns],[AS_HELP_STRING([--with-ns], -[use Nextstep (OS X Cocoa or GNUstep) windowing system. -On by default on Mac OS X.])],[],[with_ns=maybe]) +[use Nextstep (macOS Cocoa or GNUstep) windowing system. +On by default on macOS.])],[],[with_ns=maybe]) OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build]) OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) @@ -599,7 +599,7 @@ case "${canonical}" in opsys=openbsd ;; - ## Apple Darwin / Mac OS X + ## Apple Darwin / macOS *-apple-darwin* ) case "${canonical}" in *-apple-darwin[0-9].*) unported=yes ;; @@ -1864,14 +1864,14 @@ Either fix this, or re-configure with the option '--without-ns'.])]) macfont_file="" if test "${NS_IMPL_COCOA}" = "yes"; then - AC_MSG_CHECKING([for OSX 10.6 or newer]) + AC_MSG_CHECKING([for Mac OS X 10.6 or newer]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [ #ifdef MAC_OS_X_VERSION_MAX_ALLOWED #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 ; /* OK */ #else - error "OSX 10.6 or newer required"; + error "Mac OS X 10.6 or newer required"; #endif #endif ])], @@ -1880,7 +1880,7 @@ Either fix this, or re-configure with the option '--without-ns'.])]) AC_MSG_RESULT([$ns_osx_have_106]) if test $ns_osx_have_106 = no; then - AC_MSG_ERROR([OSX 10.6 or newer is required]); + AC_MSG_ERROR([Mac OS X 10.6 or newer is required]); fi fi fi @@ -3562,9 +3562,9 @@ AC_CHECK_HEADERS_ONCE(malloc/malloc.h) GNUSTEP_CFLAGS= ### Use NeXTstep API to implement GUI. if test "${HAVE_NS}" = "yes"; then - AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on Mac OS X.]) + AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on macOS.]) if test "${NS_IMPL_COCOA}" = "yes"; then - AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under MacOS X.]) + AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under macOS.]) fi if test "${NS_IMPL_GNUSTEP}" = "yes"; then AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) @@ -4725,9 +4725,9 @@ case $opsys in ;; darwin) - dnl Not __APPLE__, as this may not be defined on non-OSX Darwin. + dnl Not __APPLE__, as this may not be defined on non-macOS Darwin. dnl Not DARWIN, because Panther and lower CoreFoundation.h use DARWIN to - dnl distinguish OS X from pure Darwin. + dnl distinguish macOS from pure Darwin. AC_DEFINE(DARWIN_OS, [], [Define if the system is Darwin.]) ;; diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index f0f686f..881bf11 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -550,11 +550,11 @@ variables is not set, the category defaults to the value of the @env{LANG} is not set. But if @env{LC_ALL} is specified, it overrides the settings of all the other locale environment variables. -On MS-Windows and OS X, if @env{LANG} is not already set in the +On MS-Windows and macOS, if @env{LANG} is not already set in the environment, Emacs sets it based on the system-wide default. You can set this in the ``Regional Settings'' Control Panel on some versions of MS-Windows, and in the ``Language and Region'' System Preference on -OS X. +macOS. The value of the @env{LC_CTYPE} category is matched against entries in @code{locale-language-names}, diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index b0597dc..6e6520b 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -3,19 +3,19 @@ @c See file emacs.texi for copying conditions. @node Mac OS / GNUstep @appendix Emacs and Mac OS / GNUstep -@cindex Mac OS X +@cindex macOS @cindex Macintosh @cindex GNUstep This section describes the peculiarities of using Emacs built with the GNUstep libraries on GNU/Linux or other operating systems, or on -Mac OS X with native window system support. On Mac OS X, Emacs can be +macOS with native window system support. On macOS, Emacs can be built either without window system support, with X11, or with the Cocoa interface; this section only applies to the Cocoa build. This -does not support versions of Mac OS X earlier than 10.6. +does not support versions before Mac OS X 10.6. For various historical and technical reasons, Emacs uses the term -@samp{Nextstep} internally, instead of ``Cocoa'' or ``Mac OS X''; for +@samp{Nextstep} internally, instead of ``Cocoa'' or ``macOS''; for instance, most of the commands and variables described in this section begin with @samp{ns-}, which is short for @samp{Nextstep}. NeXTstep was an application interface released by NeXT Inc during the 1980s, of @@ -84,7 +84,7 @@ set, which often causes the subprocesses it launches to behave differently than they would when launched from the shell. For the PATH and MANPATH variables, a system-wide method -of setting PATH is recommended on Mac OS X, using the +of setting PATH is recommended on macOS, using the @file{/etc/paths} files and the @file{/etc/paths.d} directory. @node Mac / GNUstep Customization @@ -117,8 +117,8 @@ close the altered one. Useful in this context is the listing of all faces obtained by @kbd{M-x list-faces-display}. -@cindex Core Text, on Mac OS X -In Mac OS X, Emacs uses a Core Text based font backend +@cindex Core Text, on macOS +In macOS, Emacs uses a Core Text based font backend by default. If you prefer the older font style, enter the following at the command-line before starting Emacs: diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi index 6ad12d6..47ba23b 100644 --- a/doc/emacs/msdos.texi +++ b/doc/emacs/msdos.texi @@ -366,7 +366,7 @@ Emulate @sc{gnu} systems; this is the default. This sets Emulate Unix systems. Like @code{GNU}, but sets @code{ls-lisp-verbosity} to @code{(links uid)}. @item MacOS -Emulate MacOS@. Sets @code{ls-lisp-ignore-case} to @code{t}, and +Emulate macOS@. Sets @code{ls-lisp-ignore-case} to @code{t}, and @code{ls-lisp-dirs-first} and @code{ls-lisp-verbosity} to @code{nil}. @item MS-Windows Emulate MS-Windows. Sets @code{ls-lisp-ignore-case} and diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index e735343..882d75f 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -745,7 +745,7 @@ exactly what to do for end-of-line conversion: @item @dots{}-unix Don't do any end-of-line conversion; assume the file uses newline to separate lines. (This is the convention normally used -on Unix and GNU systems, and Mac OS X.) +on Unix and GNU systems, and macOS.) @item @dots{}-dos Assume the file uses carriage-return linefeed to separate lines, and do @@ -757,8 +757,8 @@ Emacs doesn't support directly.}) @item @dots{}-mac Assume the file uses carriage-return to separate lines, and do the -appropriate conversion. (This was the convention used on the -Macintosh system prior to OS X.) +appropriate conversion. (This was the convention used in Classic Mac +OS.) @end table These variant coding systems are omitted from the @@ -1393,7 +1393,7 @@ of @code{standard-fontset-spec}. This fontset's name is @noindent or just @samp{fontset-standard} for short. - On GNUstep and Mac OS X, the standard fontset is created using the value of + On GNUstep and macOS, the standard fontset is created using the value of @code{ns-standard-fontset-spec}, and on MS Windows it is created using the value of @code{w32-standard-fontset-spec}. diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index f94628c..a49bfc8 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -6958,7 +6958,7 @@ Emacs is displaying the frame using X. Emacs is displaying the frame using native MS-Windows GUI. @item ns Emacs is displaying the frame using the Nextstep interface (used on -GNUstep and Mac OS X). +GNUstep and macOS). @item pc Emacs is displaying the frame using MS-DOS direct screen writes. @item nil diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 9cf3b57..e4581b3 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1034,8 +1034,7 @@ Unix convention, used on GNU and Unix systems, is to use the linefeed character (also called newline). The DOS convention, used on MS-Windows and MS-DOS systems, is to use a carriage-return and a linefeed at the end of a line. The Mac convention is to use just -carriage-return. (This was the convention used on the Macintosh -system prior to OS X.) +carriage-return. (This was the convention used in Classic Mac OS.) @cindex base coding system @cindex variant coding system diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 0d999ae..6b9b2c7 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -888,7 +888,7 @@ Berkeley BSD and its variants. Cygwin, a Posix layer on top of MS-Windows. @item darwin -Darwin (Mac OS X). +Darwin (macOS). @item gnu The GNU system (using the GNU kernel, which consists of the HURD and Mach). diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 72a90a1..9efe0e7 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -1206,7 +1206,7 @@ Emacs can be started as a daemon in the background. @cindex NeXTstep port @cindex GNUstep port -@cindex Mac OS X Cocoa +@cindex macOS Cocoa @item There is a new NeXTstep port of Emacs. This supports GNUstep and Mac OS X (via the Cocoa libraries). The Carbon port of Emacs, which supported @@ -3341,7 +3341,7 @@ problem (@pxref{Reporting bugs}). * Emacs for MS-DOS:: * Emacs for MS-Windows:: * Emacs for GNUstep:: -* Emacs for Mac OS X:: +* Emacs for macOS:: @end menu @node Finding Emacs on the Internet @@ -3561,13 +3561,13 @@ For MS-DOS, @pxref{Emacs for MS-DOS}. Beginning with version 23.1, Emacs supports GNUstep natively. See the file @file{nextstep/INSTALL} in the distribution. -@node Emacs for Mac OS X -@section Where can I get Emacs for Mac OS X? +@node Emacs for macOS +@section Where can I get Emacs for macOS? @cindex Apple computers, Emacs for @cindex Macintosh, Emacs for -@cindex Mac OS X, Emacs for +@cindex macOS, Emacs for -Beginning with version 22.1, Emacs supports Mac OS X natively. +Beginning with version 22.1, Emacs supports macOS natively. See the file @file{nextstep/INSTALL} in the distribution. @c ------------------------------------------------------------ diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 08067b0..11f9f35 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -21520,7 +21520,7 @@ bound to mairix searches and are automatically updated. Mairix is a tool for indexing and searching words in locally stored mail. It was written by Richard Curnow and is licensed under the GPL@. Mairix comes with most popular GNU/Linux distributions, but it also -runs under Windows (with cygwin), Mac OS X and Solaris. The homepage can +runs under Windows (with cygwin), macOS and Solaris. The homepage can be found at @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html} diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 26c81d6..32b3364 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -75,7 +75,7 @@ Interactive Data Language (IDL), and running IDL as an inferior shell. * Sources of Routine Info:: How does IDLWAVE know about routine XYZ * HTML Help Browser Tips:: * Configuration Examples:: The user is king -* Windows and MacOS:: What still works, and how +* Windows and macOS:: What still works, and how * Troubleshooting:: When good computers turn bad * GNU Free Documentation License:: The license for this documentation. * Index:: Fast access @@ -2372,7 +2372,7 @@ Normal hook. Executed when @file{idlwave.el} is loaded. @cindex Subprocess of Emacs, IDL @cindex Comint, Emacs package @cindex Windows -@cindex MacOS +@cindex macOS The IDLWAVE shell is an Emacs major mode which permits running the IDL program as an inferior process of Emacs, and works closely with the @@ -2382,7 +2382,7 @@ debug these programs. The IDLWAVE shell is built on @file{comint}, an Emacs packages which handles the communication with the IDL program. Unfortunately, IDL for Windows does not have command-prompt versions and thus do not allow the interaction with Emacs, so the IDLWAVE shell -currently only works under Unix and MacOSX. +currently works under only Unix and macOS. @menu * Starting the Shell:: How to launch IDL as a subprocess @@ -3533,14 +3533,14 @@ to locate library catalogs. @end defopt @defopt idlwave-library-path -IDL library path for Windows and MacOS@. Under Unix/MacOSX, will be +IDL library path for Windows and macOS@. Under Unix/macOS, will be obtained from the Shell when run. @end defopt @defopt idlwave-system-directory -The IDL system directory for Windows and MacOS@. Also needed for +The IDL system directory for Windows and macOS@. Also needed for locating HTML help and the IDL Assistant for IDL v6.2 and later. Under -Unix/MacOSX, will be obtained from the Shell and recorded, if run. +Unix/macOS, will be obtained from the Shell and recorded, if run. @end defopt @defopt idlwave-config-directory (@file{~/.emacs.d/idlwave}) @@ -3626,7 +3626,7 @@ performance is a problem and/or the catalogs are not needed. @cindex User catalog @cindex IDL library routine info @cindex Windows -@cindex MacOS +@cindex macOS @cindex IDL variable @code{!DIR} @cindex @code{!DIR}, IDL variable @@ -3651,7 +3651,7 @@ catalog must be rescanned to update it. Creating the user catalog is also much slower than scanning library catalogs. You can scan any of the directories on the currently known path. Under -Windows and MacOS (not OSX), you need to specify the IDL search path in +Windows, you need to specify the IDL search path in the variable @code{idlwave-library-path}, and the location of the IDL directory (the value of the @code{!DIR} system variable) in the variable @code{idlwave-system-directory}, like this@footnote{The initial @samp{+} @@ -3742,10 +3742,9 @@ files. Therefore, such local files should not be installed inside the many other reasons. @cindex Windows -@cindex MacOS @cindex IDL variable @code{!DIR} @cindex @code{!DIR}, IDL variable -Users of Windows and MacOS (not X) also must set the variable +Users of Windows also must set the variable @code{idlwave-system-directory} to the value of the @code{!DIR} system variable in IDL@. IDLWAVE appends @file{lib} to the value of this variable and assumes that all files found on that path are system @@ -3822,7 +3821,7 @@ etc.). @noindent Individual platform recommendations: @itemize @bullet -@item Unix/MacOSX: The @uref{http://www.w3m.org,@code{w3m}} browser +@item Unix/macOS: The @uref{http://www.w3m.org,@code{w3m}} browser and its associated @uref{http://emacs-w3m.namazu.org/,@code{emacs-w3m}} emacs mode provide in-buffer browsing with image display, and excellent speed and @@ -4020,18 +4019,17 @@ user is King! @html @end html -@node Windows and MacOS -@appendix Windows and MacOS +@node Windows and macOS +@appendix Windows and macOS @cindex Windows -@cindex MacOS -@cindex MacOSX +@cindex macOS IDLWAVE was developed on a UNIX system. However, thanks to the portability of Emacs, much of IDLWAVE does also work under different -operating systems like Windows (with NTEmacs or NTXEmacs) or MacOS. +operating systems like Windows (with NTEmacs or NTXEmacs). The only real problem is that there is no command-line version of IDL -for Windows or MacOS(<=9) with which IDLWAVE can interact. As a +for Windows with which IDLWAVE can interact. As a result, the IDLWAVE Shell does not work and you have to rely on IDLDE to run and debug your programs. However, editing IDL source files with Emacs/IDLWAVE works with all bells and whistles, including @@ -4112,10 +4110,10 @@ ensure @samp{idl} is on your @samp{$PATH}, or specify the full pathname to the idl program with the variable @code{idlwave-shell-explicit-file-name}. Note that you may need to set your shell search path in two places when running Emacs as an Aqua -application with MacOSX; see the next topic. +application with macOS; see the next topic. @item @strong{IDLWAVE is disregarding my @samp{IDL_PATH} which I set -under MacOSX} +under macOS} If you run Emacs directly as an Aqua application, rather than from the console shell, the environment is set not from your usual shell diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index 8deead5..69d3fc4 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -68,7 +68,7 @@ database. Mairix is a tool for indexing and searching words in locally stored mail. It was written by Richard Curnow and is licensed under the GPL@. Mairix comes with most popular GNU/Linux distributions, but it also -runs under Windows (with cygwin), Mac OS X and Solaris. The homepage can +runs under Windows (with cygwin), macOS and Solaris. The homepage can be found at @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html} diff --git a/doc/misc/org.texi b/doc/misc/org.texi index a5239ac..a6f9dbd 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -6616,7 +6616,7 @@ applying it to another one. @vindex org-clock-idle-time By customizing the variable @code{org-clock-idle-time} to some integer, such as 10 or 15, Emacs can alert you when you get back to your computer after -being idle for that many minutes@footnote{On computers using Mac OS X, +being idle for that many minutes@footnote{On computers using macOS, idleness is based on actual user idleness, not just Emacs' idle time. For X11, you can install a utility program @file{x11idle.c}, available in the @code{contrib/scripts} directory of the Org git distribution, or install the diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 5ce10d2..dae5140 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -977,7 +977,7 @@ active, @pxref{Top, , D-Bus, dbus}. @cindex afp method This method is for connecting to remote hosts with the Apple Filing -Protocol for accessing files on Mac OS X volumes. @value{tramp} access +Protocol for accessing files on macOS volumes. @value{tramp} access syntax requires a leading volume (share) name, for example: @file{@trampfn{afp,user@@host,/volume}}. diff --git a/etc/DISTRIB b/etc/DISTRIB index 7c0cd4c..237e7f2 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB @@ -31,8 +31,8 @@ manuals, including the Emacs manual, are available from the FSF's online store at http://shop.fsf.org. Emacs has been run on GNU/Linux, FreeBSD, NetBSD, OpenBSD, and on many -Unix systems, on a variety of types of cpu, as well as on MSDOS, -Windows and MacOS. See the file 'etc/MACHINES' in the Emacs +Unix systems, on a variety of types of CPU, as well as on MS-DOS, +MS-Windows and macOS. See the file 'etc/MACHINES' in the Emacs distribution for a full list of machines that GNU Emacs has been tested on, with machine-specific installation notes and warnings. diff --git a/etc/MACHINES b/etc/MACHINES index 085f169..fcab23c 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -64,9 +64,9 @@ the list at the end of this file. This was tested on a little-endian sh4 system (cpu type SH7751R) running Gentoo Linux 2008.0. -** Mac OS X +** macOS - Version 10.6 or newer. PowerPC is not supported. + Mac OS X 10.6 or newer. PowerPC is not supported. For installation instructions see the file nextstep/INSTALL. ** Microsoft Windows diff --git a/etc/NEWS b/etc/NEWS index a5bcb8d..f679243 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -88,7 +88,7 @@ If gnustep-config is not available, the old heuristics are used. unless gfile is explicitly requested via --with-file-notification='gfile'. ** 'configure' detects the kqueue file notification library on *BSD -and Mac OS X machines. +and macOS machines. ** The configure option '--with-pkg-config-prog' has been removed. Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to. @@ -202,10 +202,10 @@ the 'network-security-level' variable. ** 'x-select-enable-clipboard' is renamed 'select-enable-clipboard' and 'x-select-enable-primary' is renamed 'select-enable-primary'. -Additionally they both now apply to all systems (OSX, GNUstep, Windows, you -name it), with the proviso that on some systems (e.g. Windows) -'select-enable-primary' is ineffective since the system doesn't -have the equivalent of a primary selection. +Additionally they both now apply to all systems (macOS, GNUstep, +MS-Windows, you name it), with the proviso that on some systems (e.g., +MS-Windows) 'select-enable-primary' is ineffective since the system +doesn't have the equivalent of a primary selection. ** New option 'switch-to-buffer-in-dedicated-window' allows you to customize how 'switch-to-buffer' proceeds interactively when the @@ -817,7 +817,7 @@ PLIST will contain a :peer element that has the output of ** Tramp -*** New connection method "afp", which allows you to access Mac OS X +*** New connection method "afp", which allows you to access macOS volumes via the Apple Filing Protocol. *** New connection method "nc", which allows you to access dumb @@ -1076,7 +1076,7 @@ See . ** File Notifications -*** The kqueue library is integrated for *BSD and Mac OS X machines. +*** The kqueue library is integrated for *BSD and macOS machines. *** The new event 'stopped' signals, that a file notification watch is not active any longer. @@ -1743,19 +1743,19 @@ of Windows starting with Windows 9X. ** The byte counts in etags-generated TAGS files are now the same on MS-Windows as they are on other platforms. -** On OS X, configure creates a Cocoa ("Nextstep") build by default. +** On macOS, configure creates a Cocoa ("Nextstep") build by default. Pass '--without-ns' to configure to create an X11 build, the old default. -** OS X 10.5 or older is no longer supported. +** Mac OS X 10.5 or older is no longer supported. -** OS X on PowerPC is no longer supported. +** Mac OS X on PowerPC is no longer supported. ** New variable 'ns-use-fullscreen-animation' controls animation for non-native NS fullscreen. The default is nil. Set to t to enable -animation when entering and leaving fullscreen. For native OSX fullscreen -this has no effect. +animation when entering and leaving fullscreen. For native macOS +fullscreen this has no effect. -** On the OS X Cocoa ("Nextstep") port, multicolor font (such as color +** On the macOS Cocoa ("Nextstep") port, multicolor font (such as color emoji) display is disabled. This feature was accidentally added when Emacs 24.4 included the new Core Text based font backend code that was originally implemented for a non-mainline port. This will be enabled diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 1bc4967..5e414f1 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -262,7 +262,7 @@ item was added to the menu bar to make it easily accessible You no longer need to download a separate tarball in order to build Emacs with Leim. -** Support for MacOS X was added. +** Support for Mac OS X was added. See the files mac/README and mac/INSTALL for build instructions. ** Mac OS 9 port now uses the Carbon API by default. You can also @@ -3390,7 +3390,7 @@ obsolete; use `dframe-update-speed' instead. *** display-battery-mode replaces display-battery. -*** battery.el now works on recent versions of OS X. +*** battery.el now works on recent versions of Mac OS X. ** Games diff --git a/etc/NEWS.24 b/etc/NEWS.24 index df2e11f..08021f4 100644 --- a/etc/NEWS.24 +++ b/etc/NEWS.24 @@ -84,7 +84,7 @@ It is no longer needed, as the crt*.o files are no longer linked specially. ** Directories passed to configure option `--enable-locallisppath' are no longer created during installation. -** Emacs for Nextstep (Mac OS X, GNUstep) can be built with ImageMagick support. +** Emacs for Nextstep (OS X, GNUstep) can be built with ImageMagick support. This requires pkg-config to be available at build time. @@ -1559,7 +1559,7 @@ The previous binding, introduced in Emacs 24.1, was a mistake, because *** New input method `vietnamese-vni'. -** Nextstep (GNUstep / Mac OS X) port +** Nextstep (GNUstep / OS X) port *** Support for fullscreen and the frame parameter fullscreen. @@ -2373,9 +2373,9 @@ Emacs now supports `mouse-highlight', help-echo (in the echo area), and ** On MS Windows, you can pass `--without-libxml2' to configure.bat to omit support for libxml2, even if its presence is detected. -** On Mac OS X, the Nextstep port requires OS X 10.4 or later. +** On OS X, the Nextstep port requires Mac OS X 10.4 or later. -** On Mac OS X, configure no longer automatically adds the Fink "/sw" +** On OS X, configure no longer automatically adds the Fink "/sw" directories to the search path. You must add them yourself if you want them. @@ -3833,7 +3833,7 @@ and also when HOME is set to C:\ by default. (It is only used internally in the Emacs C code.) ** Customize ns-auto-hide-menu-bar to have the menu-bar hidden, but -reappear on mouse-over. (Requires OS X 10.6 or later.) +reappear on mouse-over. (Requires Mac OS X 10.6 or later.) ** On Mac OS X, dragging a file into Emacs visits the file, like on other platforms, rather than inserting its contents into the buffer. diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP index ad2ab95..60c49ad 100644 --- a/etc/NEXTSTEP +++ b/etc/NEXTSTEP @@ -3,8 +3,8 @@ See the end of the file for license conditions. This file contains information about GNU Emacs on "Nextstep" platforms. The Nextstep support code works on many POSIX systems (and possibly -W32) using the GNUstep libraries, and on MacOS X systems using the -Cocoa libraries. +W32) using the GNUstep libraries, and on macOS systems using the Cocoa +libraries. Background ---------- @@ -17,9 +17,9 @@ system in the late 1980's. Later on, in collaboration with Sun, this API was published as a specification called OpenStep. The GNUstep project started in the early 1990's to provide a free implementation of this API. Later on, Apple bought NeXT (some would say "NeXT bought -Apple") and made OpenStep the basis of OS X, calling the API "Cocoa". -Since then, Cocoa has evolved beyond the OpenStep specification, and -GNUstep has followed it. +Apple") and made OpenStep the basis of Mac OS X, calling the API +"Cocoa". Since then, Cocoa has evolved beyond the OpenStep +specification, and GNUstep has followed it. Thus, calling this port "OpenStep" is not technically accurate, and in the absence of any other determinant, we are using the term @@ -30,8 +30,8 @@ begin with the letters "NS". (See http://en.wikipedia.org/wiki/Nextstep) This Emacs port was first released in the early 1990's on the NeXT -computer, and was successively updated to OpenStep, Rhapsody, OS X, -and then finally GNUstep, tracking GNU emacs core releases in the +computer, and was successively updated to OpenStep, Rhapsody, Mac OS +X, and then finally GNUstep, tracking GNU Emacs core releases in the meantime. @@ -62,13 +62,13 @@ Release History 1999/05/?? 6.0b3 Scott Bender: "OS X Server", Emacs 20.3. -2001/06/25 7.0 Ported to MacOS X (10.1) by Christophe de +2001/06/25 7.0 Ported to Mac OS X (10.1) by Christophe de Dinechin. Release based on Emacs 20.7. Hosting moved to SourceForge. 2002/01/03 7.0.1 Bug fixes. -2002/08/27 7.0.2 Jaguar (OS X 10.2) support. Added an autoconf +2002/08/27 7.0.2 Jaguar (Mac OS X 10.2) support. Added autoconf option for sys_nerr being in stdio. Added libncurses to the build libraries. Fixed a problem with ns-alternate-is-meta. Changed the @@ -76,7 +76,7 @@ Release History 2004/10/07 8.0-pre1 Ported to GNUstep by Adrian Robert. -2004/11/04 8.0-pre2 Restored functionality on OS X (menu code +2004/11/04 8.0-pre2 Restored functionality on Mac OS X (menu code cleanup). Improved scrollbar handling and paste from other applications. File icons obtained properly from NSWorkspace. Dropped @@ -116,7 +116,8 @@ Release History and Planner go away. Improved scrollbar handling and rendering speed. Color panel and other bug fixes. mac-fix-env utility. - Font handling improvements (OS X 10.3, 10.4): + Font handling improvements (Mac OS X 10.3, + 10.4): - heed 'GSFontAntiAlias' default - heed system antialiasing threshold - added 'UseQuickdrawSmoothing' default to @@ -150,8 +151,9 @@ Release History handling improved. Fixed some portability problems on Tiger and Puma. -2005/09/12 8.0 Bundled ispell on OS X. Minor bug fixes and - stability improvements. Compiles under gcc-4. +2005/09/12 8.0 Bundled ispell on Mac OS X. Minor bug fixes + and stability improvements. Compiles under + gcc-4. 2005/09/26 8.0.1 Correct clipped rendering for synthetic italics. Include the info directory. @@ -247,7 +249,7 @@ Christian Limpach Scott Bender OpenStep, Rhapsody ports Christophe de Dinechin - MacOS X port + macOS port Adrian Robert GNUstep port, update Emacs 20 -> 21+ diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 9d80139..8d8c0c6 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -952,7 +952,7 @@ instead of requiring each Babel library one by one. - New option [[doc:org-gnus-no-server][org-gnus-no-server]] to start Gnus with =gnus-no-server= - Org is now distributed with =htmlize.el= version 1.43 - ~org-drill.el~ has been updated to version 2.3.7 -- ~org-mac-iCal.el~ now supports MacOSX version up to 10.8 +- ~org-mac-iCal.el~ now supports OS X versions up to 10.8 - Various improvements to ~org-contacts.el~ and =orgpan.el= ** Outside Org diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 008f5a1..9904339 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -604,7 +604,7 @@ See . When you have a large number of buffers running auto-revert-mode, and Emacs is configured to use the kqueue file notification library, it uses an own file descriptor for every watched file. On systems with a -small limit of file descriptors allowed per process, like OS X, you +small limit of file descriptors allowed per process, like macOS, you could run out of file descriptors. You won't be able to open new files. auto-revert-use-notify is set to nil in global-auto-revert-mode, therefore. diff --git a/etc/TODO b/etc/TODO index 48c1654..84c1b6d 100644 --- a/etc/TODO +++ b/etc/TODO @@ -700,7 +700,7 @@ resize the frame. **** Support 'proced' (implement 'process-attributes') Unfortunately, a user-level process like Emacs does not have the -privileges to get information about other processes under OS X. +privileges to get information about other processes under macOS. There are other ways to do this: @@ -711,7 +711,7 @@ There are other ways to do this: 3) Ask the user to self-sign Emacs, if this feature is of interest. Anders Lindgren has implemented -'process-attributes' for OS X, which currently only work when +'process-attributes' for macOS, which currently only work when running Emacs as root. See this article by Bozhidar Batsov for an overview of Proced: @@ -724,11 +724,11 @@ even though Emacs allows a user to customize such features. *** New features -This section contains features unique to Nextstep and/or OS X. +This section contains features unique to Nextstep and/or macOS. **** PressAndHold for writing accented character -On OS X, many application support the press and hold pattern to +On macOS, many application support the press and hold pattern to invoke a menu of accented characters. (See example at https://support.apple.com/en-us/HT201586 .) @@ -741,7 +741,7 @@ implemented in Emacs for a free system. **** Floating scroll bars -In modern OS X applications, the scroll bar often floats over the +In modern macOS applications, the scroll bar often floats over the content, and is invisible unless actually used. This makes the user interface less cluttered and more area could be used to contain text. @@ -804,7 +804,7 @@ This section contains issues where there is an ongoing debate. **** Key bindings of CMD and ALT Currently in the "ns" port, ALT is bound to Meta and CMD is bound to -Super -- allowing the user to use typical OS X commands like CMD-A to +Super -- allowing the user to use typical macOS commands like CMD-A to mark everything. Unfortunately, when using an international keyboard, you can't type @@ -852,9 +852,10 @@ Emacs can be build in a number of different ways. For each feature, consider if is really is "NS" specific, or if it should be applied to all build versions. -- With the "NS" interface. This is the normal way to build Emacs on OS X. +- With the "NS" interface. This is the normal way to build Emacs on + macOS. -- With the "X11" interface. On OS X, this is mainly of interest to +- With the "X11" interface. On macOS, this is mainly of interest to developers of Emacs to get a "reference" interface implementations. However, it might be of interest for people working remotely, as X11 applications can be used over a network connection. @@ -863,12 +864,12 @@ all build versions. *** Bugs -**** Incorrect translation of Super modifier with Ctrl or Meta on OS X +**** Incorrect translation of Super modifier with Ctrl or Meta on macOS When pressing 'M-s-a', Emacs replies "M-s-å is undefined". What happened is a mix of Emacs view that Meta and Super has been pressed, -and OS X view that ALT-a should yield "å" (U+00E5 LATIN SMALL LETTER A -WITH RING ABOVE). +and macOS view that ALT-a should yield "å" (U+00E5 LATIN SMALL LETTER +A WITH RING ABOVE). The bug reports suggest two different patches; unfortunately, neither works properly. For example: diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 5fa152a..2aaec25 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -75,7 +75,7 @@ am__v_at_1 = # ==================== Where To Install Things ==================== -# Location to install Emacs.app under GNUstep / Mac OS X. +# Location to install Emacs.app under GNUstep / macOS. # Later values may use this. ns_appbindir=@ns_appbindir@ diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index b5373c6..c42ca81 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1646,7 +1646,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." ;; converts "\" to "/". ;; - For 0 generic: generic_to_unix_filename() downcases if there's ;; no lower case already present, and converts "\" to "/". - ;; - For 'm' MacOS: macos_to_unix_filename() changes "/" to ":" and + ;; - For 'm' macOS: macos_to_unix_filename() changes "/" to ":" and ;; ":" to "/" (setq fiddle (cond ((= ?M osid) t) ((= 0 osid) (string= efnname (upcase efnname))))) diff --git a/lisp/battery.el b/lisp/battery.el index b5e312f..20f3017 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -22,10 +22,10 @@ ;;; Commentary: -;; There is at present support for GNU/Linux, OS X and Windows. This +;; There is at present support for GNU/Linux, macOS and Windows. This ;; library supports both the `/proc/apm' file format of Linux version ;; 1.3.58 or newer and the `/proc/acpi/' directory structure of Linux -;; 2.4.20 and 2.6. Darwin (OS X) is supported by using the `pmset' +;; 2.4.20 and 2.6. Darwin (macOS) is supported by using the `pmset' ;; program. Windows is supported by the GetSystemPowerStatus API call. ;;; Code: @@ -600,7 +600,7 @@ The following %-sequences are provided: (cons ?t (or remaining-time "N/A"))))) -;;; `pmset' interface for Darwin (OS X). +;;; `pmset' interface for Darwin (macOS). (defun battery-pmset () "Get battery status information using `pmset'. diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el index ec29239..b56b268 100644 --- a/lisp/cedet/semantic/bovine/gcc.el +++ b/lisp/cedet/semantic/bovine/gcc.el @@ -225,7 +225,7 @@ It should also include other symbols GCC was compiled with.") (setq semantic-lex-c-preprocessor-symbol-map nil)) (dolist (D defines) (add-to-list 'semantic-lex-c-preprocessor-symbol-map D)) - ;; Needed for parsing OS X libc + ;; Needed for parsing macOS libc (when (eq system-type 'darwin) (add-to-list 'semantic-lex-c-preprocessor-symbol-map '("__i386__" . ""))) (when (featurep 'semantic/bovine/c) diff --git a/lisp/faces.el b/lisp/faces.el index b1ea0f0..a84edab 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -108,7 +108,7 @@ a font height that isn't optimal." "Courier 10 Pitch" ;; This looks good on MS-Windows and OS X. "Consolas" - ;; This looks good on OS X. "Courier" looks good too, but is + ;; This looks good on macOS. "Courier" looks good too, but is ;; jagged on GNU/Linux and so is listed later as "courier". "Courier Std" ;; Although these are anti-aliased, they are a bit faint compared diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index 52765ce..df8f61f 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -423,13 +423,13 @@ with \"[a/b/c] \" if CHOICES is \(?a ?b ?c)." ;; Keychain collection matching any user, host, and protocol ((eq entry 'macos-keychain-generic) (auth-source-backend-parse '(:source (:macos-keychain-generic default)))) - ;; take macos-keychain-internet:XYZ and recurse to get it as MacOS + ;; take macos-keychain-internet:XYZ and recurse to get it as macOS ;; Keychain "XYZ" matching any user, host, and protocol ((and (stringp entry) (string-match "^macos-keychain-internet:\\(.+\\)" entry)) (auth-source-backend-parse `(:source (:macos-keychain-internet ,(match-string 1 entry))))) - ;; take macos-keychain-generic:XYZ and recurse to get it as MacOS + ;; take macos-keychain-generic:XYZ and recurse to get it as macOS ;; Keychain "XYZ" matching any user, host, and protocol ((and (stringp entry) (string-match "^macos-keychain-generic:\\(.+\\)" entry)) @@ -458,7 +458,7 @@ with \"[a/b/c] \" if CHOICES is \(?a ?b ?c)." :search-function #'auth-source-netrc-search :create-function #'auth-source-netrc-create))) - ;; the MacOS Keychain + ;; the macOS Keychain ((and (not (null (plist-get entry :source))) ; the source must not be nil (listp (plist-get entry :source)) ; and it must be a list @@ -1666,7 +1666,7 @@ authentication tokens: &key backend create delete type max &allow-other-keys) - "Search the MacOS Keychain; spec is like `auth-source'. + "Search the macOS Keychain; spec is like `auth-source'. All search keys must match exactly. If you need substring matching, do a wider search and narrow it down yourself. @@ -1688,13 +1688,13 @@ Similarly, :host maps to \"-c HOST\" (the \"creator\" keychain field), :user maps to \"-a USER\", and :port maps to \"-s PORT\". Here's an example that looks for the first item in the default -generic MacOS Keychain: +generic macOS Keychain: (let ((auth-sources \\='(macos-keychain-generic))) (auth-source-search :max 1) Here's another that looks for the first item in the internet -MacOS Keychain collection whose label is `gnus': +macOS Keychain collection whose label is `gnus': (let ((auth-sources \\='(macos-keychain-internet))) (auth-source-search :max 1 :label \"gnus\") @@ -1707,11 +1707,11 @@ entries for git.gnus.org: " ;; TODO (assert (not create) nil - "The MacOS Keychain auth-source backend doesn't support creation yet") + "The macOS Keychain auth-source backend doesn't support creation yet") ;; TODO ;; (macos-keychain-delete-item coll elt) (assert (not delete) nil - "The MacOS Keychain auth-source backend doesn't support deletion yet") + "The macOS Keychain auth-source backend doesn't support deletion yet") (let* ((coll (oref backend source)) (max (or max 5000)) ; sanity check: default to stop at 5K diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index e7c7049..5008fd5 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2723,7 +2723,7 @@ See also `locale-charset-language-names', `locale-language-names', ;; On Darwin, file names are always encoded in utf-8, no matter ;; the locale. (setq default-file-name-coding-system 'utf-8) - ;; Mac OS X's Terminal.app by default uses utf-8 regardless of + ;; macOS's Terminal.app by default uses utf-8 regardless of ;; the locale. (when (and (null window-system) (equal (getenv "TERM_PROGRAM" frame) "Apple_Terminal")) diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el index 1e247c5..29cd042 100644 --- a/lisp/international/ucs-normalize.el +++ b/lisp/international/ucs-normalize.el @@ -624,7 +624,7 @@ COMPOSITION-PREDICATE will be used to compose region." ;;; coding-system definition (define-coding-system 'utf-8-hfs - "UTF-8 based coding system for MacOS HFS file names. + "UTF-8 based coding system for macOS HFS file names. The singleton characters in HFS normalization exclusion will not be decomposed." :coding-type 'utf-8 diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 85e91cd..41587bf 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -75,7 +75,7 @@ ((memq system-type '(hpux usg-unix-v irix berkeley-unix)) 'UNIX)) ; very similar to GNU ;; Anything else defaults to nil, meaning GNU. - "Platform to emulate: GNU (default), MacOS, MS-Windows, UNIX. + "Platform to emulate: GNU (default), macOS, MS-Windows, UNIX. Corresponding value is one of: nil, `MacOS', `MS-Windows', `UNIX'. Set this to your preferred value; it need not match the actual platform you are using. diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index ce3c50b..86aefe4 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -72,7 +72,7 @@ (defvar message-strip-special-text-properties) (defun report-emacs-bug-can-use-osx-open () - "Return non-nil if the OS X \"open\" command is available for mailing." + "Return non-nil if the macOS \"open\" command is available for mailing." (and (featurep 'ns) (equal (executable-find "open") "/usr/bin/open") (memq system-type '(darwin)))) @@ -107,7 +107,7 @@ This requires you to be running either Gnome, KDE, or Xfce4." (defun report-emacs-bug-insert-to-mailer () "Send the message to your preferred mail client. -This requires either the OS X \"open\" command, or the freedesktop +This requires either the macOS \"open\" command, or the freedesktop \"xdg-email\" command to be available." (interactive) (save-excursion diff --git a/lisp/man.el b/lisp/man.el index 5acf90b..94b9e0d 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -887,7 +887,7 @@ test/automated/man-tests.el in the emacs repository." (setq default-directory "/") ;; in case inherited doesn't exist ;; Actually for my `man' the arg is a regexp. ;; POSIX says it must be ERE and "man-db" seems to agree, - ;; whereas under MacOSX it seems to be BRE-style and doesn't + ;; whereas under macOS it seems to be BRE-style and doesn't ;; accept backslashes at all. Let's not bother to ;; quote anything. (let ((process-environment (copy-sequence process-environment))) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 640395e..ba1bf34 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1865,7 +1865,7 @@ key, a click, or a menu-item")) '(menu-item "Emacs Tutorial" help-with-tutorial :help "Learn how to use Emacs")) - ;; In OS X it's in the app menu already. + ;; In macOS it's in the app menu already. ;; FIXME? There already is an "About Emacs" (sans ...) entry in the Help menu. (and (featurep 'ns) (not (eq system-type 'darwin)) diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index d5c03e3..239da78 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -740,7 +740,7 @@ These mean that the FTP process should be (or already has been) killed." :type 'regexp) (defcustom ange-ftp-potential-error-msgs - ;; On Mac OS X we sometimes get things like: + ;; On macOS we sometimes get things like: ;; ;; ftp> open ftp.nluug.nl ;; Trying 2001:610:1:80aa:192:87:102:36... diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index be85928..68258d4 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -44,7 +44,7 @@ ;; browse-url-text-* Any text browser 0 ;; browse-url-generic arbitrary ;; browse-url-default-windows-browser MS-Windows browser -;; browse-url-default-macosx-browser Mac OS X browser +;; browse-url-default-macosx-browser macOS browser ;; browse-url-xdg-open Free Desktop xdg-open on Gnome, KDE, Xfce4, LXDE ;; browse-url-kde KDE konqueror (kfm) ;; browse-url-elinks Elinks Don't know (tried with 0.12.GIT) @@ -162,7 +162,7 @@ regexp should probably be \".\" to specify a default browser." :value browse-url-generic) (function-item :tag "Default Windows browser" :value browse-url-default-windows-browser) - (function-item :tag "Default Mac OS X browser" + (function-item :tag "Default macOS browser" :value browse-url-default-macosx-browser) (function-item :tag "Default browser" :value browse-url-default-browser) @@ -870,7 +870,7 @@ The optional NEW-WINDOW argument is not used." (t (w32-shell-execute "open" url)))) (defun browse-url-default-macosx-browser (url &optional _new-window) - "Invoke the MacOS X system's default Web browser. + "Invoke the macOS system's default Web browser. The optional NEW-WINDOW argument is not used" (interactive (browse-url-interactive-arg "URL: ")) (start-process (concat "open " url) nil "open" url)) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 2983d40..842b1ce 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1272,7 +1272,7 @@ target of the symlink differ." res-uid res-gid res-size res-symlink-target) (tramp-message vec 5 "file attributes with ls: %s" localname) ;; We cannot send all three commands combined, it could exceed - ;; NAME_MAX or PATH_MAX. Happened on Mac OS X, for example. + ;; NAME_MAX or PATH_MAX. Happened on macOS, for example. (when (or (tramp-send-command-and-check vec (format "%s %s" @@ -4263,7 +4263,7 @@ process to set up. VEC specifies the connection." (when (search-forward "\r" nil t) (setq cs-decode (tramp-compat-coding-system-change-eol-conversion cs-decode 'dos))) - ;; Special setting for Mac OS X. + ;; Special setting for macOS. (when (and (string-match "^Darwin" uname) (memq 'utf-8-hfs (coding-system-list))) (setq cs-decode 'utf-8-hfs @@ -4325,7 +4325,7 @@ process to set up. VEC specifies the connection." (tramp-send-command vec "stty tabs" t) (tramp-send-command vec "stty tab0" t)) - ;; Set utf8 encoding. Needed for Mac OS X, for example. This is + ;; Set utf8 encoding. Needed for macOS, for example. This is ;; non-POSIX, so we must expect errors on some systems. (tramp-send-command vec "stty iutf8 2>/dev/null" t) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index cb8e4d4..5d8081c 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1018,7 +1018,7 @@ this variable to be set as well." :type '(choice (const nil) integer)) ;; Logging in to a remote host normally requires obtaining a pty. But -;; Emacs on MacOS X has process-connection-type set to nil by default, +;; Emacs on macOS has process-connection-type set to nil by default, ;; so on those systems Tramp doesn't obtain a pty. Here, we allow ;; for an override of the system default. (defcustom tramp-process-connection-type t diff --git a/lisp/org/org.el b/lisp/org/org.el index 13e4a22..eb01426 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1937,7 +1937,7 @@ See `org-file-apps'.") ("eps.gz" . "gv %s") ("dvi" . "xdvi %s") ("fig" . "xfig %s")) - "Default file applications on a MacOS X system. + "Default file applications on a macOS system. The system \"open\" is known as a default, but we use X11 applications for some files for which the OS does not have a good default. See `org-file-apps'.") @@ -2012,7 +2012,7 @@ file identifier are (\"html\" . default) to the list as well. t Default for files not matched by any of the other options. `system' The system command to open files, like `open' on Windows - and Mac OS X, and mailcap under GNU/Linux. This is the command + and macOS, and mailcap under GNU/Linux. This is the command that will be selected if you call `C-c C-o' with a double \\[universal-argument] \\[universal-argument] prefix. diff --git a/lisp/printing.el b/lisp/printing.el index d9cc2a3..72f825f 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -2272,7 +2272,7 @@ Useful links: * gv 3.5, June 1997 `http://www.cs.wisc.edu/~ghost/gv/gv_doc/gv.html' -* MacGSView (MacOS) +* MacGSView (Mac OS) `http://www.cs.wisc.edu/~ghost/macos/index.htm' " :type '(string :tag "Ghostview Utility") diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index d243650..978b816 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -69,12 +69,12 @@ ;; 2) Use MinGW GDB instead. ;; 3) Use cygwin-mount.el -;;; Mac OSX: +;;; macOS: -;; GDB in Emacs on Mac OSX works best with FSF GDB as Apple have made -;; some changes to the version that they include as part of Mac OSX. -;; This requires GDB version 7.0 or later (estimated release date Aug 2009) -;; as earlier versions do not compile on Mac OSX. +;; GDB in Emacs on macOS works best with FSF GDB as Apple have made +;; some changes to the version that they include as part of macOS. +;; This requires GDB version 7.0 or later as earlier versions do not +;; compile on macOS. ;;; Known Bugs: diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 9cb2ca7..bc607ac 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -420,22 +420,22 @@ A value of t means to show all source files." :type 'integer) (defcustom idlwave-library-path nil - "Library path for Windows and MacOS (OS9). Not needed under UNIX. + "Library path for Windows and Mac OS (OS9). Not needed under UNIX. When selecting the directories to scan for IDL user catalog routine info, IDLWAVE can, under UNIX, query the shell for the exact search -path \(the value of !PATH). However, under Windows and MacOS -\(pre-OSX), the IDLWAVE shell does not work. In this case, this -variable can be set to specify the paths where IDLWAVE can find PRO -files. The shell will only be asked for a list of paths when this -variable is nil. The value is a list of directories. A directory +path (the value of !PATH). However, under MS-Windows, the +IDLWAVE shell does not work. In this case, this variable can be +set to specify the paths where IDLWAVE can find PRO files. The +shell will only be asked for a list of paths when this variable +is nil. The value is a list of directories. A directory preceded by a `+' will be searched recursively. If you set this -variable on a UNIX system, the shell will not be queried. See also -`idlwave-system-directory'." +variable on a UNIX system, the shell will not be queried. See +also `idlwave-system-directory'." :group 'idlwave-routine-info :type '(repeat (directory))) (defcustom idlwave-system-directory "" - "The IDL system directory for Windows and MacOS. Not needed under + "The IDL system directory for Windows and Mac OS. Not needed under UNIX. Set this to the value of the `!DIR' system variable in IDL. IDLWAVE uses this to find out which of the library routines belong to the official system library. All files inside the `lib' subdirectory diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 3fae398..8ec9feb 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2414,7 +2414,7 @@ banner and the initial prompt are received separately." (defun python-shell-comint-end-of-output-p (output) "Return non-nil if OUTPUT is ends with input prompt." (string-match - ;; XXX: It seems on OSX an extra carriage return is attached + ;; XXX: It seems on macOS an extra carriage return is attached ;; at the end of output, this handles that too. (concat "\r?\n?" diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index e737131..21bba48 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -1,4 +1,4 @@ -;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/MacOS X window system -*- lexical-binding: t -*- +;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/macOS window system -*- lexical-binding: t -*- ;; Copyright (C) 1993-1994, 2005-2016 Free Software Foundation, Inc. @@ -41,7 +41,7 @@ ;;; Code: (eval-when-compile (require 'cl-lib)) (or (featurep 'ns) - (error "%s: Loading ns-win.el but not compiled for GNUstep/MacOS" + (error "%s: Loading ns-win.el but not compiled for GNUstep/macOS" (invocation-name))) ;; Documentation-purposes only: actually loaded in loadup.el. @@ -54,7 +54,7 @@ (require 'ucs-normalize) (defgroup ns nil - "GNUstep/Mac OS X specific features." + "GNUstep/macOS specific features." :group 'environment) ;;;; Command line argument handling. @@ -338,7 +338,7 @@ See `ns-insert-working-text'." (setq ns-working-overlay nil)) -;; OS X file system Unicode UTF-8 NFD (decomposed form) support. +;; macOS file system Unicode UTF-8 NFD (decomposed form) support. (when (eq system-type 'darwin) ;; Used prior to Emacs 25. (define-coding-system-alias 'utf-8-nfd 'utf-8-hfs) @@ -641,7 +641,7 @@ This function has been overloaded in Nextstep.") (set-frame-font ns-input-font)) -;; Default fontset for Mac OS X. This is mainly here to show how a fontset +;; Default fontset for macOS. This is mainly here to show how a fontset ;; can be set up manually. Ordinarily, fontsets are auto-created whenever ;; a font is chosen by (defvar ns-standard-fontset-spec @@ -655,7 +655,7 @@ This function has been overloaded in Nextstep.") ",") "String of fontset spec of the standard fontset. This defines a fontset consisting of the Courier and other fonts that -come with OS X. +come with macOS. See the documentation of `create-fontset-from-fontset-spec' for the format.") (defvar ns-reg-to-script) ; nsfont.m @@ -892,7 +892,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (setq default-process-coding-system '(utf-8-unix . utf-8-unix))))) - ;; OS X Lion introduces PressAndHold, which is unsupported by this port. + ;; Mac OS X Lion introduces PressAndHold, which is unsupported by this port. ;; See this thread for more details: ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html (ns-set-resource nil "ApplePressAndHoldEnabled" "NO") diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 19eb37a..880141b 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -771,7 +771,7 @@ We run the first FUNCTION whose STRING matches the input events." ;; Try to find out the type of terminal by sending a "Secondary ;; Device Attributes (DA)" query. (xterm--query "\e[>0c" - ;; Some terminals (like OS X's Terminal.app) respond to + ;; Some terminals (like macOS's Terminal.app) respond to ;; this query as if it were a "Primary Device Attributes" ;; query instead, so we should handle that too. '(("\e[?" . xterm--version-handler) diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 3d4854e..aea8e70 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -645,7 +645,7 @@ as well but give an additional message." ;; ;; The adjustment function that adorns or rotates a section title. (rst-define-key map [?\C-c ?\C-=] 'rst-adjust [?\C-c ?\C-a t]) - (rst-define-key map [?\C-=] 'rst-adjust) ; Does not work on the Mac OSX and + (rst-define-key map [?\C-=] 'rst-adjust) ; Does not work on macOS and ; on consoles. ;; \C-c \C-a is the keymap for adornments. diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 573feed..b0ad5ea 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -551,7 +551,7 @@ If non-nil, NEW means to create a new buffer no matter what." ;; is accessed via SSH, a bad interaction between libc, ;; CVS and SSH can lead to garbled output. ;; It might be a glibc-specific problem (but it can also happens - ;; under Mac OS X, it seems). + ;; under macOS, it seems). ;; It seems that using a pty can help circumvent the problem, ;; but at the cost of screwing up when the process thinks it ;; can ask for user input (such as password or host-key @@ -696,7 +696,7 @@ SUBDIR is the subdirectory (if any) where this command was run. OLD-FIS is the list of fileinfos on which the cvs command was applied and which should be considered up-to-date if they are missing from the output." (when (eq system-type 'darwin) - ;; Fixup the ^D^H^H inserted at beginning of buffer sometimes on MacOSX + ;; Fixup the ^D^H^H inserted at beginning of buffer sometimes on macOS ;; because of the call to `process-send-eof'. (save-excursion (goto-char (point-min)) diff --git a/nextstep/INSTALL b/nextstep/INSTALL index dd690ab..3740346 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL @@ -19,7 +19,7 @@ In the top-level directory, use: ./configure --with-ns -(On Mac OS X, --with-ns is enabled by default.) +(On macOS, --with-ns is enabled by default.) This will compile all the files, but emacs will not be able to be run except in -nw (terminal) mode. diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 9aa034a..d6e1282 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -35,12 +35,12 @@ MKDIR_P = @MKDIR_P@ ## Emacs.app. ns_appdir = @ns_appdir@ -## GNUstep: ns_appdir; OS X: ns_appdir/Contents/MacOS +## GNUstep: ns_appdir; macOS: ns_appdir/Contents/MacOS ns_appbindir = @ns_appbindir@ ## GNUstep/Emacs.base or Cocoa/Emacs.base. ns_appsrc = @ns_appsrc@ ## GNUstep: GNUstep/Emacs.base/Resources/Info-gnustep.plist -## OS X: Cocoa/Emacs.base/Contents/Info.plist +## macOS: Cocoa/Emacs.base/Contents/Info.plist ns_check_file = @ns_appdir@/@ns_check_file@ .PHONY: all diff --git a/nextstep/README b/nextstep/README index 7a1a092..6d37bb7 100644 --- a/nextstep/README +++ b/nextstep/README @@ -1,8 +1,8 @@ - NS -- the Cocoa interface for OS X and compatible systems - --------------------------------------------------------- + NS -- the Cocoa interface for macOS and compatible systems + ---------------------------------------------------------- This directory contains files needed to build Emacs on system based on -NextStep (NS), including OS X (Mac) and GNUstep, using the Cocoa API. +NextStep (NS), including macOS and GNUstep, using the Cocoa API. HISTORY @@ -14,14 +14,14 @@ OpenStep and then Rhapsody, which became Mac OS X. In 2004 it was adapted to GNUstep, a free OpenStep implementation, and in 2008 it was merged to the GNU Emacs trunk and released with Emacs 23. Around the same time a separate Mac-only port using the Carbon APIs and -descending from a 2001 MacOS 8/9 port of Emacs 21 was removed. (It +descending from a 2001 Mac OS 8/9 port of Emacs 21 was removed. (It remains available externally under the name "mac".) OVERVIEW OF COCOA AND OBJECTIVE-C Cocoa is an API for the Objective-C language, an objective oriented -superset of C. Anybody with experience with iOS or modern OS X +superset of C. Anybody with experience with iOS or modern macOS application development should feel at home. A method call in Objective-C differs from most other languages in the @@ -58,11 +58,11 @@ Classes are declared like the following: * Don't use macros and types intended for the XCode Interface Builder, like 'IBAction'. -* The NS interface should work on all version of OS X from 10.6.8 - (Snow Leopard) to the latest official release. +* The NS interface should work on all version of macOS from Mac OS X + 10.6.8 (Snow Leopard) to the latest official release. -* Under OS X, it is possible to build Emacs using NS, X11, or console - only. A new OS X feature should work in all appropriate builds. +* Under macOS, it is possible to build Emacs using NS, X11, or console + only. A new macOS feature should work in all appropriate builds. TRACING SUPPORT @@ -76,7 +76,7 @@ uncomment the lines defining symbols starting with 'NSTRACE_GROUP'. GNUSTEP AND OTHER COMPATIBLE SYSTEMS -The NS interface works on system compatible with OS X, for example +The NS interface works on systems compatible with macOS, for example GNUstep. Even though they are less frequently used, this is important for a number of reasons: @@ -84,7 +84,7 @@ for a number of reasons: look-and-feel as the rest of the system. * This allows other Emacs developers to test their changes on the NS - interface without having access to an OS X machine. + interface without having access to a macOS machine. * If a feature in the NS interface work on free systems like GNUstep, this meets the FSF requirement that features in GNU software should diff --git a/nextstep/templates/Emacs.desktop.in b/nextstep/templates/Emacs.desktop.in index 170f195..4fed1e3 100644 --- a/nextstep/templates/Emacs.desktop.in +++ b/nextstep/templates/Emacs.desktop.in @@ -4,7 +4,7 @@ Type=Application Version=@version@ Categories=GNUstep Name=Emacs -Comment=GNU Emacs for NeXT/Open/GNUstep and OS X +Comment=GNU Emacs for NeXT/Open/GNUstep and macOS Icon=emacs.tiff Exec=openapp Emacs.app #TryExec=Emacs.app diff --git a/nextstep/templates/Info-gnustep.plist.in b/nextstep/templates/Info-gnustep.plist.in index 679eb4f..1fd3184 100644 --- a/nextstep/templates/Info-gnustep.plist.in +++ b/nextstep/templates/Info-gnustep.plist.in @@ -1,11 +1,11 @@ { - ApplicationDescription = "GNU Emacs for GNUstep / OS X"; + ApplicationDescription = "GNU Emacs for GNUstep / macOS"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; ApplicationRelease = "@version@"; Authors = ( "Adrian Robert (GNUstep)", - "Christophe de Dinechin (MacOS X)", + "Christophe de Dinechin (macOS)", "Scott Bender (OpenStep)", "Christian Limpach (NeXTstep)", "Carl Edman (NeXTstep)", diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in index dcd2fe3..686b804 100644 --- a/nextstep/templates/Info.plist.in +++ b/nextstep/templates/Info.plist.in @@ -504,7 +504,7 @@ along with GNU Emacs. If not, see . - + UTExportedTypeDeclarations diff --git a/src/coding.c b/src/coding.c index 9f709be..3e4af72 100644 --- a/src/coding.c +++ b/src/coding.c @@ -122,7 +122,7 @@ END-OF-LINE FORMAT How text end-of-line is encoded depends on operating system. For instance, Unix's format is just one byte of LF (line-feed) code, whereas DOS's format is two-byte sequence of `carriage-return' and - `line-feed' codes. MacOS's format is usually one byte of + `line-feed' codes. Classic Mac OS's format is usually one byte of `carriage-return'. Since text character encoding and end-of-line encoding are diff --git a/src/conf_post.h b/src/conf_post.h index f83965b..d8070fa 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -192,7 +192,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #endif #endif /* MSDOS */ -/* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs, +/* macOS / GNUstep need a bit more pure memory. Of the existing knobs, SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ #ifdef HAVE_NS #if defined NS_IMPL_GNUSTEP diff --git a/src/emacs.c b/src/emacs.c index f8d5dfa..ce30ae7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2412,7 +2412,7 @@ Special values: `gnu' compiled for a GNU Hurd system. `gnu/linux' compiled for a GNU/Linux system. `gnu/kfreebsd' compiled for a GNU system with a FreeBSD kernel. - `darwin' compiled for Darwin (GNU-Darwin, Mac OS X, ...). + `darwin' compiled for Darwin (GNU-Darwin, macOS, ...). `ms-dos' compiled as an MS-DOS application. `windows-nt' compiled as a native W32 application. `cygwin' compiled using the Cygwin library. diff --git a/src/frame.c b/src/frame.c index cfa5f7d..854f72e 100644 --- a/src/frame.c +++ b/src/frame.c @@ -5088,7 +5088,7 @@ Setting this variable does not affect existing frames, only new ones. */); doc: /* Default position of vertical scroll bars on this window-system. */); #ifdef HAVE_WINDOW_SYSTEM #if defined (HAVE_NTGUI) || defined (NS_IMPL_COCOA) || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)) - /* MS-Windows, Mac OS X, and GTK have scroll bars on the right by + /* MS-Windows, macOS, and GTK have scroll bars on the right by default. */ Vdefault_frame_scroll_bars = Qright; #else diff --git a/src/gtkutil.c b/src/gtkutil.c index 0f256c5..e323216 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2370,7 +2370,7 @@ make_widget_for_menu_item (const char *utf8_label, const char *utf8_key) in the group. On exit, *GROUP contains the radio item group. Unfortunately, keys don't line up as nicely as in Motif, - but the MacOS X version doesn't either, so I guess that is OK. */ + but the macOS version doesn't either, so I guess that is OK. */ static GtkWidget * make_menu_item (const char *utf8_label, diff --git a/src/macfont.h b/src/macfont.h index 6630fb5..8f73452 100644 --- a/src/macfont.h +++ b/src/macfont.h @@ -1,4 +1,4 @@ -/* Interface definition for Mac OSX Core text font backend. +/* Interface definition for macOS Core text font backend. Copyright (C) 2009-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macfont.m b/src/macfont.m index 0445628..ed7c1e3 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -1,4 +1,4 @@ -/* Font driver on Mac OSX Core text. +/* Font driver on macOS Core text. Copyright (C) 2009-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1005,7 +1005,7 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char, and those start with ".". NULL means the cache has been invalidated. Otherwise, the value is CFArray of CFStrings and the elements are sorted in the canonical order (CTFontManagerCompareFontFamilyNames on -OS X 10.6 and later). */ +Mac OS X 10.6 and later). */ static CFArrayRef macfont_available_families_cache = NULL; @@ -4042,7 +4042,7 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no void syms_of_macfont (void) { - /* Core Text, for Mac OS X. */ + /* Core Text, for macOS. */ DEFSYM (Qmac_ct, "mac-ct"); macfont_driver.type = Qmac_ct; register_font_driver (&macfont_driver, NULL); diff --git a/src/nsfns.m b/src/nsfns.m index 9bc6c1d..82bb84a 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1,4 +1,4 @@ -/* Functions for the NeXT/Open/GNUstep and MacOSX window system. +/* Functions for the NeXT/Open/GNUstep and macOS window system. Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2016 Free Software Foundation, Inc. @@ -22,7 +22,7 @@ Originally by Carl Edman Updated by Christian Limpach (chris@nice.ch) OpenStep/Rhapsody port by Scott Bender (sbender@harmony-ds.com) -MacOSX/Aqua port by Christophe de Dinechin (descubes@earthlink.net) +macOS/Aqua port by Christophe de Dinechin (descubes@earthlink.net) GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) */ @@ -942,7 +942,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side x_icon (struct frame *f, Lisp_Object parms) /* -------------------------------------------------------------------------- Strangely-named function to set icon position parameters in frame. - This is irrelevant under OS X, but might be needed under GNUstep, + This is irrelevant under macOS, but might be needed under GNUstep, depending on the window manager used. Note, this is not a standard frame parameter-setter; it is called directly from x-create-frame. -------------------------------------------------------------------------- */ @@ -2060,7 +2060,7 @@ and GNUstep implementations ("distributor-specific release [svcs setAutoenablesItems: NO]; #ifdef NS_IMPL_COCOA - [svcs update]; /* on OS X, converts from '/' structure */ + [svcs update]; /* on macOS, converts from '/' structure */ #endif ret = interpret_services_menu (svcs, Qnil, ret); diff --git a/src/nsfont.m b/src/nsfont.m index 92e7d11..4f95ee3 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -1,4 +1,4 @@ -/* Font back-end driver for the NeXT/Open/GNUstep and MacOSX window system. +/* Font back-end driver for the NeXT/Open/GNUstep and macOS window system. See font.h Copyright (C) 2006-2016 Free Software Foundation, Inc. @@ -500,7 +500,7 @@ but also for ascii (which causes unnecessary font substitution). */ { NSCharacterSet *fset = [[fontMgr fontWithFamily: family traits: 0 weight: 5 size: 12.0] coveredCharacterSet]; - /* Some fonts on OS X, maybe many on GNUstep, return nil. */ + /* Some fonts on macOS, maybe many on GNUstep, return nil. */ if (fset == nil) fset = [NSCharacterSet characterSetWithRange: NSMakeRange (0, 127)]; diff --git a/src/nsimage.m b/src/nsimage.m index 5b2534b..66aecd4 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -1,4 +1,4 @@ -/* Image support for the NeXT/Open/GNUstep and MacOSX window system. +/* Image support for the NeXT/Open/GNUstep and macOS window system. Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2016 Free Software Foundation, Inc. @@ -21,7 +21,7 @@ Originally by Carl Edman Updated by Christian Limpach (chris@nice.ch) OpenStep/Rhapsody port by Scott Bender (sbender@harmony-ds.com) -MacOSX/Aqua port by Christophe de Dinechin (descubes@earthlink.net) +macOS/Aqua port by Christophe de Dinechin (descubes@earthlink.net) GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) */ diff --git a/src/nsmenu.m b/src/nsmenu.m index 7d340e8..f73c184 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1,4 +1,4 @@ -/* NeXT/Open/GNUstep and MacOSX Cocoa menu and toolbar module. +/* NeXT/Open/GNUstep and macOS Cocoa menu and toolbar module. Copyright (C) 2007-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -93,7 +93,7 @@ /* -------------------------------------------------------------------------- Update menubar. Three cases: 1) ! deep_p, submenu = nil: Fresh switch onto a frame -- either set up - just top-level menu strings (OS X), or goto case (2) (GNUstep). + just top-level menu strings (macOS), or goto case (2) (GNUstep). 2) deep_p, submenu = nil: Recompute all submenus. 3) deep_p, submenu = non-nil: Update contents of a single submenu. -------------------------------------------------------------------------- */ @@ -584,7 +584,7 @@ - (void)menuNeedsUpdate: (NSMenu *)menu return; /*fprintf (stderr, "Updating menu '%s'\n", [[self title] UTF8String]); NSLog (@"%@\n", event); */ #ifdef NS_IMPL_GNUSTEP - /* Don't know how to do this for anything other than OSX >= 10.5 + /* Don't know how to do this for anything other than Mac OS X 10.5 and later. This is wrong, as it might run Lisp code in the event loop. */ ns_update_menubar (frame, true, self); #endif @@ -645,7 +645,7 @@ - (NSMenuItem *)addItemWithWidgetValue: (void *)wvptr keyEq = [self parseKeyEquiv: wv->key]; #ifdef NS_IMPL_COCOA - /* OS X just ignores modifier strings longer than one character */ + /* macOS just ignores modifier strings longer than one character */ if (keyEquivModMask == 0) title = [title stringByAppendingFormat: @" (%@)", keyEq]; #endif @@ -1057,9 +1057,9 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f /* Check if this is a separator. */ if (EQ (TOOLPROP (TOOL_BAR_ITEM_TYPE), Qt)) { - /* Skip separators. Newer OSX don't show them, and on GNUstep they - are wide as a button, thus overflowing the toolbar most of - the time. */ + /* Skip separators. Newer macOS don't show them, and on + GNUstep they are wide as a button, thus overflowing the + toolbar most of the time. */ continue; } diff --git a/src/nsselect.m b/src/nsselect.m index eba2393..b7c9148 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -1,4 +1,4 @@ -/* NeXT/Open/GNUstep / MacOSX Cocoa selection processing for emacs. +/* NeXT/Open/GNUstep / macOS Cocoa selection processing for emacs. Copyright (C) 1993-1994, 2005-2006, 2008-2016 Free Software Foundation, Inc. @@ -21,7 +21,7 @@ Originally by Carl Edman Updated by Christian Limpach (chris@nice.ch) OpenStep/Rhapsody port by Scott Bender (sbender@harmony-ds.com) -MacOSX/Aqua port by Christophe de Dinechin (descubes@earthlink.net) +macOS/Aqua port by Christophe de Dinechin (descubes@earthlink.net) GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) */ diff --git a/src/nsterm.m b/src/nsterm.m index 4d9d105..4f99a13 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1,4 +1,4 @@ -/* NeXT/Open/GNUstep / MacOSX communication module. -*- coding: utf-8 -*- +/* NeXT/Open/GNUstep / macOS communication module. -*- coding: utf-8 -*- Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2016 Free Software Foundation, Inc. @@ -22,7 +22,7 @@ Originally by Carl Edman Updated by Christian Limpach (chris@nice.ch) OpenStep/Rhapsody port by Scott Bender (sbender@harmony-ds.com) -MacOSX/Aqua port by Christophe de Dinechin (descubes@earthlink.net) +macOS/Aqua port by Christophe de Dinechin (descubes@earthlink.net) GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) */ @@ -250,7 +250,7 @@ - (NSColor *)colorUsingDefaultColorSpace 0x1B, 0x1B /* escape */ }; -/* On OS X picks up the default NSGlobalDomain AppleAntiAliasingThreshold, +/* On macOS picks up the default NSGlobalDomain AppleAntiAliasingThreshold, the maximum font size to NOT antialias. On GNUstep there is currently no way to control this behavior. */ float ns_antialias_threshold; @@ -587,7 +587,7 @@ - (NSColor *)colorUsingDefaultColorSpace void ns_init_locale (void) -/* OS X doesn't set any environment variables for the locale when run +/* macOS doesn't set any environment variables for the locale when run from the GUI. Get the locale from the OS and set LANG. */ { NSLocale *locale = [NSLocale currentLocale]; @@ -596,7 +596,7 @@ - (NSColor *)colorUsingDefaultColorSpace @try { - /* It seems OS X should probably use UTF-8 everywhere. + /* It seems macOS should probably use UTF-8 everywhere. 'localeIdentifier' does not specify the encoding, and I can't find any way to get the OS to tell us which encoding to use, so hard-code '.UTF-8'. */ @@ -718,7 +718,7 @@ Free a pool and temporary objects it refers to (callable from C) /* A screen margin between 1 and DOCK_IGNORE_LIMIT (inclusive) is - assumed to contain a hidden dock. OS X currently use 4 pixels for + assumed to contain a hidden dock. macOS currently use 4 pixels for this, however, to be future compatible, a larger value is used. */ #define DOCK_IGNORE_LIMIT 6 @@ -731,7 +731,7 @@ Free a pool and temporary objects it refers to (callable from C) struct EmacsMargins margins = ns_screen_margins(screen); - /* OS X (currently) reserved 4 pixels along the edge where a hidden + /* macOS (currently) reserved 4 pixels along the edge where a hidden dock is located. Unfortunately, it's not possible to find the location and information about if the dock is hidden. Instead, it is assumed that if the margin of an edge is less than @@ -748,7 +748,7 @@ Free a pool and temporary objects it refers to (callable from C) { margins.top = 0; } - /* Note: This doesn't occur in current versions of OS X, but + /* Note: This doesn't occur in current versions of macOS, but included for completeness and future compatibility. */ if (margins.bottom <= DOCK_IGNORE_LIMIT) { @@ -1027,7 +1027,7 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen) #ifdef NS_IMPL_COCOA if ([view isFullscreen] && [view fsIsNative]) { - // Fix reappearing tool bar in fullscreen for OSX 10.7 + // Fix reappearing tool bar in fullscreen for Mac OS X 10.7 BOOL tbar_visible = FRAME_EXTERNAL_TOOL_BAR (f) ? YES : NO; NSToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar]; if (! tbar_visible != ! [toolbar isVisible]) @@ -1986,8 +1986,8 @@ static void hide_bell () } else if ([nsname isEqualToString: @"ns_selection_fg_color"]) { - /* NOTE: OSX applications normally don't set foreground selection, but - text may be unreadable if we don't. + /* NOTE: macOS applications normally don't set foreground + selection, but text may be unreadable if we don't. */ if ((new = [NSColor selectedTextColor]) != nil) { @@ -3937,7 +3937,7 @@ overwriting cursor (usually when cursor on a tab) */ #ifdef NS_IMPL_COCOA if (! send_appdefined) { - /* OSX 10.10.1 swallows the AppDefined event we are sending ourselves + /* OS X 10.10.1 swallows the AppDefined event we are sending ourselves in certain situations (rapid incoming events). So check if we have one, if not add one. */ NSEvent *appev = [NSApp nextEventMatchingMask:NSApplicationDefinedMask @@ -4816,7 +4816,7 @@ static Lisp_Object ns_string_to_lispmod (const char *s) [outerpool release]; outerpool = [[NSAutoreleasePool alloc] init]; - /* count object allocs (About, click icon); on OS X use ObjectAlloc tool */ + /* count object allocs (About, click icon); on macOS use ObjectAlloc tool */ /*GSDebugAllocationActive (YES); */ block_input (); @@ -4945,7 +4945,7 @@ Needs to be here because ns_initialize_display_info () uses AppKit classes. ns_app_name = [[NSProcessInfo processInfo] processName]; - /* Set up OS X app menu */ + /* Set up macOS app menu */ NSTRACE_MSG ("Menu init"); @@ -5017,7 +5017,7 @@ Needs to be here because ns_initialize_display_info () uses AppKit classes. selector: @selector (trackingNotification:) name: NSMenuDidEndTrackingNotification object: mainMenu]; } -#endif /* MAC OS X menu setup */ +#endif /* macOS menu setup */ /* Register our external input/output types, used for determining applicable services and also drag/drop eligibility. */ @@ -5245,7 +5245,7 @@ - (void)sendEvent: (NSEvent *)theEvent #ifdef NS_IMPL_COCOA /* If no dialog and none of our frames have focus and it is a move, skip it. - It is a mouse move in an auxiliary menu, i.e. on the top right on OSX, + It is a mouse move in an auxiliary menu, i.e. on the top right on macOS, such as Wifi, sound, date or similar. This prevents "spooky" highlighting in the frame under the menu. */ if (type == NSMouseMoved && [NSApp modalWindow] == nil) @@ -5784,7 +5784,7 @@ - (void)keyDown: (NSEvent *)theEvent NSTRACE ("[EmacsView keyDown:]"); - /* Rhapsody and OS X give up and down events for the arrow keys */ + /* Rhapsody and macOS give up and down events for the arrow keys */ if (ns_fake_keydown == YES) ns_fake_keydown = NO; else if ([theEvent type] != NSKeyDown) @@ -6018,7 +6018,7 @@ flag set (this is probably a bug in the OS). #ifdef NS_IMPL_COCOA -/* Needed to pick up Ctrl-tab and possibly other events that OS X has +/* Needed to pick up Ctrl-tab and possibly other events that Mac OS X decided not to send key-down for. See http://osdir.com/ml/editors.vim.mac/2007-10/msg00141.html This only applies on Tiger and earlier. @@ -7176,8 +7176,8 @@ - (void)windowDidEnterFullScreen /* provided for direct calls */ #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 unsigned val = (unsigned)[NSApp presentationOptions]; - // OSX 10.7 bug fix, the menu won't appear without this. - // val is non-zero on other OSX versions. + // Mac OS X 10.7 bug fix, the menu won't appear without this. + // val is non-zero on other macOS versions. if (val == 0) { NSApplicationPresentationOptions options @@ -7601,7 +7601,7 @@ - (void)drawRect: (NSRect)rect unblock_input (); /* - drawRect: may be called (at least in OS X 10.5) for invisible + drawRect: may be called (at least in Mac OS X 10.5) for invisible views as well for some reason. Thus, do not infer visibility here. @@ -8123,7 +8123,7 @@ + (CGFloat) scrollerWidth [self setEnabled: YES]; /* Ensure auto resizing of scrollbars occurs within the emacs frame's view - locked against the top and bottom edges, and right edge on OS X, where + locked against the top and bottom edges, and right edge on macOS, where scrollers are on right. */ #ifdef NS_IMPL_GNUSTEP [self setAutoresizingMask: NSViewMaxXMargin | NSViewHeightSizable]; @@ -8730,14 +8730,14 @@ Convert an X font name (XLFD) to an NS font name. DEFVAR_LISP ("ns-auto-hide-menu-bar", ns_auto_hide_menu_bar, doc: /* Non-nil means that the menu bar is hidden, but appears when the mouse is near. -Only works on OSX 10.6 or later. */); +Only works on Mac OS X 10.6 or later. */); ns_auto_hide_menu_bar = Qnil; DEFVAR_BOOL ("ns-use-native-fullscreen", ns_use_native_fullscreen, - doc: /*Non-nil means to use native fullscreen on OSX >= 10.7. + doc: /*Non-nil means to use native fullscreen on Mac OS X 10.7 and later. Nil means use fullscreen the old (< 10.7) way. The old way works better with -multiple monitors, but lacks tool bar. This variable is ignored on OSX < 10.7. -Default is t for OSX >= 10.7, nil otherwise. */); +multiple monitors, but lacks tool bar. This variable is ignored on +Mac OS X < 10.7. Default is t for 10.7 and later, nil otherwise. */); #ifdef HAVE_NATIVE_FS ns_use_native_fullscreen = YES; #else @@ -8752,9 +8752,9 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with ns_use_fullscreen_animation = NO; DEFVAR_BOOL ("ns-use-srgb-colorspace", ns_use_srgb_colorspace, - doc: /*Non-nil means to use sRGB colorspace on OSX >= 10.7. + doc: /*Non-nil means to use sRGB colorspace on Mac OS X 10.7 and later. Note that this does not apply to images. -This variable is ignored on OSX < 10.7 and GNUstep. */); +This variable is ignored on Mac OS X < 10.7 and GNUstep. */); ns_use_srgb_colorspace = YES; /* TODO: move to common code */ diff --git a/src/sysdep.c b/src/sysdep.c index 460166d..674e76d 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2337,7 +2337,7 @@ posix_close (int fd, int flag) closed, and retrying the close could inadvertently close a file descriptor allocated by some other thread. In other systems (e.g., HP/UX) FD is not closed. And in still other systems - (e.g., OS X, Solaris), maybe FD is closed, maybe not, and in a + (e.g., macOS, Solaris), maybe FD is closed, maybe not, and in a multithreaded program there can be no way to tell. So, in this case, pretend that the close succeeded. This works diff --git a/src/unexmacosx.c b/src/unexmacosx.c index bdacc8b..f755f7f 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -1,4 +1,4 @@ -/* Dump Emacs in Mach-O format for use on Mac OS X. +/* Dump Emacs in Mach-O format for use on macOS. Copyright (C) 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -24,7 +24,7 @@ along with GNU Emacs. If not, see . */ Mach-O format: the file loader.h, man pages for Mach-O and ld, old NEXTSTEP documents of the Mach-O format. The tool otool dumps the mach header (-h option) and the load commands (-l option) in a - Mach-O file. The tool nm on Mac OS X displays the symbol table in + Mach-O file. The tool nm on macOS displays the symbol table in a Mach-O file. For examples of unexec for the Mach-O format, see the file unexnext.c in the GNU Emacs distribution, the file unexdyld.c in the Darwin port of GNU Emacs 20.7, and unexdyld.c in @@ -33,7 +33,7 @@ along with GNU Emacs. If not, see . */ Read that to see what they do. This file was written completely from scratch, making use of information from the above sources. */ -/* The Mac OS X implementation of unexec makes use of Darwin's `zone' +/* The macOS implementation of unexec makes use of Darwin's `zone' memory allocator. All calls to malloc, realloc, and free in Emacs are redirected to unexec_malloc, unexec_realloc, and unexec_free in this file. When temacs is run, all memory requests are handled in @@ -49,7 +49,7 @@ along with GNU Emacs. If not, see . */ block must be obtained by malloc and the old contents copied to it. */ -/* Peculiarity of the Mach-O files generated by ld in Mac OS X +/* Peculiarity of the Mach-O files generated by ld in macOS (possible causes of future bugs if changed). The file offset of the start of the __TEXT segment is zero. Since @@ -118,9 +118,9 @@ along with GNU Emacs. If not, see . */ #include -/* LC_DATA_IN_CODE is not defined in mach-o/loader.h on OS X 10.7. +/* LC_DATA_IN_CODE is not defined in mach-o/loader.h on Mac OS X 10.7. But it is used if we build with "Command Line Tools for Xcode 4.5 - (OS X Lion) - September 2012". */ + (Mac OS X Lion) - September 2012". */ #ifndef LC_DATA_IN_CODE #define LC_DATA_IN_CODE 0x29 /* table of non-instructions in __text */ #endif commit 84c53436ab25b6c8f76c133e59b34e533ea33cc7 Author: Paul Eggert Date: Sat Nov 5 20:41:37 2016 -0700 Prefer comments /* like this */ in C code Emacs C code assumes C99 features, but has long used traditional comments /* like this */ instead of C99-style comments // like this. Stick with traditional comments for now, partly for style, partly as it may be safer with compilers that are not fully in C99 mode. diff --git a/src/emacs-module.c b/src/emacs-module.c index eca5af7..a28fe57 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -142,8 +142,8 @@ static emacs_value const module_nil = 0; or a pointer to handle non-local exits. The function must have an ENV parameter. The function will return the specified value if a signal or throw is caught. */ -// TODO: Have Fsignal check for CATCHER_ALL so we only have to install -// one handler. +/* TODO: Have Fsignal check for CATCHER_ALL so we only have to install + one handler. */ #define MODULE_HANDLE_NONLOCAL_EXIT(retval) \ MODULE_SETJMP (CONDITION_CASE, module_handle_signal, retval); \ MODULE_SETJMP (CATCHER_ALL, module_handle_throw, retval) @@ -163,7 +163,7 @@ static emacs_value const module_nil = 0; code after the macro may longjmp back into the macro, which means its local variable C must stay live in later code. */ -// TODO: Make backtraces work if this macros is used. +/* TODO: Make backtraces work if this macros is used. */ #define MODULE_SETJMP_1(handlertype, handlerfunc, retval, c, dummy) \ if (module_non_local_exit_check (env) != emacs_funcall_exit_return) \ diff --git a/src/gfilenotify.c b/src/gfilenotify.c index 3b1f2fc..30d0753 100644 --- a/src/gfilenotify.c +++ b/src/gfilenotify.c @@ -105,7 +105,7 @@ dir_monitor_callback (GFileMonitor *monitor, /* Store it into the input event queue. */ kbd_buffer_store_event (&event); - // XD_DEBUG_MESSAGE ("%s", XD_OBJECT_TO_STRING (event.arg)); + /* XD_DEBUG_MESSAGE ("%s", XD_OBJECT_TO_STRING (event.arg)); */ } /* Cancel monitor if file or directory is deleted. */ diff --git a/src/gtkutil.c b/src/gtkutil.c index e791e6a..0f256c5 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -185,7 +185,7 @@ xg_display_open (char *display_name, Display **dpy) { GdkDisplay *gdpy; - unrequest_sigio (); // See comment in x_display_ok, xterm.c. + unrequest_sigio (); /* See comment in x_display_ok, xterm.c. */ gdpy = gdk_display_open (display_name); request_sigio (); if (!gdpy_def && gdpy) diff --git a/src/image.c b/src/image.c index 78539d9..6a62235 100644 --- a/src/image.c +++ b/src/image.c @@ -3712,7 +3712,7 @@ xpm_load (struct frame *f, struct image *img) } #ifdef USE_CAIRO - // Load very specific Xpm:s. + /* Load very specific Xpm:s. */ if (rc == XpmSuccess && img->ximg->format == ZPixmap && img->ximg->bits_per_pixel == 32 @@ -3736,7 +3736,7 @@ xpm_load (struct frame *f, struct image *img) int maskidx = mid ? i * img->mask_img->bytes_per_line + k/8 : 0; int mask = mid ? mid[maskidx] & (1 << (k % 8)) : 1; - if (mask) od[idx] = id[idx] + 0xff000000; // ff => full alpha + if (mask) od[idx] = id[idx] + 0xff000000; /* ff => full alpha */ else od[idx] = bgcolor; } } diff --git a/src/kqueue.c b/src/kqueue.c index c848b7f..49ca0c9 100644 --- a/src/kqueue.c +++ b/src/kqueue.c @@ -264,8 +264,6 @@ kqueue_compare_dir_list (Lisp_Object watch_object) report_file_error ("New list not empty", new_dl); if (! NILP (pending_dl)) report_file_error ("Pending events list not empty", pending_dl); - // if (! NILP (deleted_dl)) - // report_file_error ("Deleted events list not empty", deleted_dl); /* Replace old directory listing with the new one. */ XSETCDR (Fnthcdr (make_number (3), watch_object), diff --git a/src/w32fns.c b/src/w32fns.c index c57b5a1..27c0d65 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6934,7 +6934,7 @@ value of DIR as in previous invocations; this is standard Windows behavior. */) } new_file_details_w; #ifdef NTGUI_UNICODE - wchar_t filename_buf_w[32*1024 + 1]; // NT kernel maximum + wchar_t filename_buf_w[32*1024 + 1]; /* NT kernel maximum */ OPENFILENAMEW * file_details_w = &new_file_details_w.details; const int use_unicode = 1; #else /* not NTGUI_UNICODE */ diff --git a/src/xdisp.c b/src/xdisp.c index a13830c..f575b27 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -24461,7 +24461,7 @@ calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop, } if (FRAME_WINDOW_P (it->f) && valid_xwidget_spec_p (prop)) { - // TODO: Don't return dummy size. + /* TODO: Don't return dummy size. */ return OK_PIXELS (100); } #endif diff --git a/src/xselect.c b/src/xselect.c index 123e463..ff6dc32 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -693,7 +693,7 @@ x_reply_selection_request (struct selection_input_event *event, : format_bytes); XFlush (display); had_errors_p = x_had_errors_p (display); - // See comment above about property_change_reply. + /* See comment above about property_change_reply. */ set_property_change_object (cs->wait_object); unblock_input (); @@ -1393,7 +1393,7 @@ receive_incremental_selection (struct x_display_info *dpyinfo, wait_object = expect_property_change (display, window, property, PropertyNewValue); XFlush (display); - // See comment in x_reply_selection_request about property_change_reply. + /* See comment in x_reply_selection_request about property_change_reply. */ set_property_change_object (wait_object); unblock_input (); @@ -1433,7 +1433,8 @@ receive_incremental_selection (struct x_display_info *dpyinfo, XDeleteProperty (display, window, property); wait_object = expect_property_change (display, window, property, PropertyNewValue); - // See comment in x_reply_selection_request about property_change_reply. + /* See comment in x_reply_selection_request about + property_change_reply. */ set_property_change_object (wait_object); XFlush (display); unblock_input (); diff --git a/src/xsmfns.c b/src/xsmfns.c index 42e2340..d54a94d 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -170,7 +170,7 @@ smc_save_yourself_CB (SmcConn smcConn, char *smid_opt, *chdir_opt = NULL; Lisp_Object user_login_name = Fuser_login_name (Qnil); - // Must have these. + /* Must have these. */ if (! STRINGP (Vinvocation_name) || ! STRINGP (user_login_name)) return; diff --git a/src/xterm.c b/src/xterm.c index c64c174..213a527 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11950,7 +11950,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) #else /* not USE_X_TOOLKIT */ XSetLocaleModifiers (""); - unrequest_sigio (); // See comment in x_display_ok. + unrequest_sigio (); /* See comment in x_display_ok. */ dpy = XOpenDisplay (SSDATA (display_name)); request_sigio (); #endif /* not USE_X_TOOLKIT */ commit bb61e50533a4dd1f2f93de1f8ca55d31f9094e6d Author: Noam Postavsky Date: Tue Nov 1 23:18:37 2016 -0400 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845). diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 81a1922..1468603 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -610,8 +610,8 @@ and @code{define-global-minor-mode}. @item Other definition types: @code{defcustom}, @code{defgroup}, @code{defclass} -(@pxref{Top,EIEIO,,eieio,EIEIO}), and @code{define-skeleton} (see the -commentary in @file{skeleton.el}). +(@pxref{Top,EIEIO,,eieio,EIEIO}), and @code{define-skeleton} +(@pxref{Top,Autotyping,,autotype,Autotyping}). @end table You can also use a magic comment to execute a form at build time commit 3ef86fd06378f43f8d90c7c120b4fe605d187e9f Author: Eli Zaretskii Date: Sat Nov 5 10:54:15 2016 +0200 Clarify documentation of face attribute functions * doc/lispref/display.texi (Attribute Functions): Make sure to document that an omitted FRAME argument means the same as nil. (Bug#24879) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 2e316f8..f94628c 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2548,7 +2548,7 @@ modifying the attributes of a named face. This function returns the value of the @var{attribute} attribute for @var{face} on @var{frame}. -If @var{frame} is @code{nil}, that means the selected frame +If @var{frame} is omitted or @code{nil}, that means the selected frame (@pxref{Input Focus}). If @var{frame} is @code{t}, this function returns the value of the specified attribute for newly-created frames (this is normally @code{unspecified}, unless you have specified some @@ -2644,8 +2644,8 @@ created frames. The following commands and functions mostly provide compatibility with old versions of Emacs. They work by calling -@code{set-face-attribute}. Values of @code{t} and @code{nil} for -their @var{frame} argument are handled just like +@code{set-face-attribute}. Values of @code{t} and @code{nil} (or +omitted) for their @var{frame} argument are handled just like @code{set-face-attribute} and @code{face-attribute}. The commands read their arguments using the minibuffer, if called interactively. @@ -2714,7 +2714,8 @@ name used for @var{character}. @defun face-foreground face &optional frame inherit @defunx face-background face &optional frame inherit These functions return the foreground color (or background color, -respectively) of face @var{face}, as a string. +respectively) of face @var{face}, as a string. If the color is +unspecified, they return @code{nil}. @end defun @defun face-stipple face &optional frame inherit commit de51d59802b33555fb23a924a49bb782e6caa2b8 Author: Eli Zaretskii Date: Sat Nov 5 10:07:30 2016 +0200 ; * nt/README.W32: Minor copyedits. diff --git a/nt/README.W32 b/nt/README.W32 index d866d9f..7ffeb0a 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,11 +1,11 @@ Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs for Windows + Emacs for MS-Windows This README file describes how to set up and run a precompiled - distribution of GNU Emacs for Windows. You can find the precompiled - distribution on the ftp.gnu.org server and its mirrors: + distribution of GNU Emacs for MS-Windows. You can find the + precompiled distribution on the ftp.gnu.org server and its mirrors: ftp://ftp.gnu.org/gnu/emacs/windows/ @@ -15,19 +15,23 @@ See the end of the file for license conditions. Information on how to compile Emacs from sources on Windows is in the files README and INSTALL in the nt/ sub-directory of the top-level Emacs directory in the source distribution, as is this - file as README.precompiled. If you received this file as part of - the Emacs source distribution, and are looking for information on + file under the name README.W32. If you received this file as part + of the Emacs source distribution, and are looking for information on how to build Emacs on MS-Windows, please read those 2 files and not this one. * Preliminaries There are two binary distributions named - emacs-n-x86_64-w64-mingw32.zip and - emacs-n-i686-w64-mingw32.zip. These are for 64-bit and 32-bit - machines respectively. + emacs-VER-x86_64-w64-mingw32.zip and emacs-VER-i686-w64-mingw32.zip, + where VER is the Emacs version. These are 64-bit and 32-bit builds, + respectively. If you are running a 32-bit version of MS-Windows, + you need to install the 32-bit build; users of 64-bit Windows can + use either build, but we recommend to install the 64-bit one, as it + will be able to edit larger buffers and will generally run faster. The binary distribution has these top-level directories: + + bin + libexec + share @@ -36,23 +40,42 @@ See the end of the file for license conditions. * Setting up Emacs To install Emacs, simply unpack the binary package into a directory - of your choice. If you use File Explorer and "Extract" by default - this will be in a top-level directory with the same name as the zip - file. + of your choice. If you use the Windows Explorer and its "Extract" + action, by default this will be in a top-level directory with the + same name as the zip file. We also provide a set of optional dependencies, in - emacs-25-x86_64-deps.zip or emacs-25-i686-deps.zip respectively, - which provide Emacs with an number of additional capabilities. To - add these, unpack them directly over the emacs directory structure. + emacs-MVER-x86_64-deps.zip or emacs-MVER-i686-deps.zip respectively, + where MVER is the major Emacs version that should use these + libraries. These provide Emacs with a number of additional optional + capabilities, described in detail below. To use these, unpack them + directly over the emacs directory structure. Note that, if + extracting with the Windows Explorer, you will have to override the + directory where it wants to put the file with the same directory + where you extracted the Emacs binary package. Finally, and also optionally, you can run the program addpm.exe in the bin subdirectory which will place an icon for Emacs on the start - page. - - Emacs is completely portable. You can create your own shortcut to - runemacs.exe and place this wherever you find it convenient, or - run it from a USB or network drive without copying or installing - anything on the machine itself. + page. (This is no longer needed in latest versions of Emacs, so we + recommend you not do that, as running addpm.exe will insert entries + into the Registry which might get in the way if you upgrade to later + versions without updating those entries, or would like to uninstall + Emacs.) + + Emacs is completely portable. You can create your own shortcut to + runemacs.exe and place this wherever you find it convenient (the + desktop and/or the Taskbar), or run it from a USB or network drive + without copying or installing anything on the machine itself. + +* Prerequisites for Windows 9X + + The 32-bit build supports MS-Windows 9X (Windows 95/98/Me). To run + Emacs on these versions of Windows, you will need to have the + Microsoft Layer for Unicode (MSLU) installed. It can be downloaded + from the Microsoft site, and comes in a form of a single dynamic + library called UNICOWS.DLL. If this library is not accessible to + Emacs on Windows 9X, it will pop up a dialog saying that it cannot + find the UNICOWS library, and will refuse to start up. * Starting Emacs @@ -66,7 +89,7 @@ See the end of the file for license conditions. If you want to use Emacs in tty or character mode within a command window, you can start it by typing "emacs -nw" at the command prompt. (Obviously, you need to ensure that the Emacs bin subdirectory is in - your PATH first, or specify the path to emacs.exe.) The -nw + your Path first, or specify the path to emacs.exe.) The -nw (non-windowed) mode of operation is most useful if you have a telnet server on your machine, allowing you to run Emacs remotely. @@ -90,7 +113,8 @@ See the end of the file for license conditions. + emacsclientw.exe - A version of emacsclient that does not open a command-line window. - + addpm.exe - The installer that adds Emacs to "Start". + + addpm.exe - A basic installer that adds Emacs to "Start" menus and + adds Emacs-related entries to the Windows Registry. + ctags.exe, etags.exe - Tools for generating tag files. See the `Tags' node of the Emacs manual. @@ -124,26 +148,56 @@ See the end of the file for license conditions. + update-game-score.exe - A utility for updating the score files of Emacs games. -* Optional Dependencies +* Optional dependency libraries Emacs has built in support for XBM and PPM/PGM/PBM images, and the libXpm library is bundled, providing XPM support (required for color - toolbar icons and splash screen). Source for libXpm should be + toolbar icons and splash screen). Source for libXpm should be available from the same place from which you got this binary distribution. - In addition, as described, there is a separate dependency bundle - providing support for many images formats, TLS, XML parsing and - compression. + Emacs has a number of optional features which need additional + libraries. These are provided in a separate bundle of dependencies, + as described above, and enable support for the following: + + - displaying inline images of many types (PNG, JPEG, GIF, TIFF, SVG) + - SSL/TLS secure network communications (HTTPS, IMAPS, etc.) + - HTML and XML parsing (necessary for the built-in EWW browser) + - built-in decompression of compressed text + + The optional dependency libraries are in emacs-MVER-x86_64-deps.zip + (64-bit) and emacs-MVER-i686-deps.zip (32-bit), and their sources + are in emacs-MVER-deps-mingw-w64-src.zip, where MVER is the major + version of Emacs that should use these dependencies. Note that a + 64-bit Emacs will only work with the 64-bit dependencies, and the + 32-bit Emacs only with the 32-bit dependencies. + + Newer/updated builds for these optional libraries are available at + http://msys2.github.io/ and + http://sourceforge.net/projects/ezwinports/files/ (but you shouldn't + need these except in emergencies). + + If you install the libraries in a directory different from where you + have the Emacs executable programs, we recommend to add the + directory with DLLs to your Path, so that Emacs will be able to find + those DLLs when needed. -* Installing with an existing MSYS2 installation. +* Installing Emacs with an existing MSYS2 installation You may also use Emacs with an existing MSYS2 installation by simply - unpacking the Emacs distribution over MSYS2. You can then use the - 'pacman' utility to install dependencies. You should not use the - optional dependencies bundle, as this will overwrite MSYS2 files - (the dependency bundle derives from MSYS2, but may be a different - version). + unpacking the Emacs distribution over MSYS2. You can then use the + 'pacman' utility to install dependencies. You should not use the + optional dependencies bundle from this site, as this will overwrite + MSYS2 files (the dependency bundle derives from MSYS2, but may be a + different version). + + Some of the optional libraries need to be of certain versions to + work with your Emacs binary. Make sure you install those versions + of dependencies, and no others. Emacs variables such as + libpng-version and libjpeg-version tell what versions of the + corresponding libraries are expected by Emacs. (We recommend that + you use the dependency bundle, where these issues are always + resolved.) To install the optional libraries, start the MSYS2 Bash window and type the following command: @@ -153,17 +207,25 @@ See the end of the file for license conditions. where PACKAGES is the list of packages you want to install. The full list is as follows: - mingw-w64-x86_64-giflib - mingw-w64-x86_64-gnutls - mingw-w64-x86_64-libjpeg-turbo - mingw-w64-x86_64-libpng - mingw-w64-x86_64-librsvg - mingw-w64-x86_64-libtiff - mingw-w64-x86_64-libxml2 - mingw-w64-x86_64-xpm-nox + mingw-w64-x86_64-giflib + mingw-w64-x86_64-gnutls + mingw-w64-x86_64-libjpeg-turbo + mingw-w64-x86_64-libpng + mingw-w64-x86_64-librsvg + mingw-w64-x86_64-libtiff + mingw-w64-x86_64-libxml2 + mingw-w64-x86_64-xpm-nox - You can type any subset of this list. Once again, when asked - whether to proceed with installation, answer Y. + You can type any subset of this list. When asked whether to proceed + with installation, answer Y. + + Alternatively, you could install the packages manually from this + page: + + https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/ + + However, the packages there are not self-contained, so you will need + to manually download all their dependencies as well. * Uninstalling Emacs @@ -184,6 +246,9 @@ See the end of the file for license conditions. * Troubleshooting + Some known problems and their solutions can be found in the file + etc\PROBLEMS in the unpacked Emacs distribution. + Virus scanners Some virus scanners interfere with Emacs' use of subprocesses. If you @@ -191,6 +256,12 @@ See the end of the file for license conditions. McAfee's Vshield, turn off "Scan all files" (WinGuard) or "boot sector scanning" (McAfee exclusion properties). + Windows 9X + + On Windows 9X, make sure you have the UNICOWS.DLL library either in + the same directory where you have emacs.exe or in the directory + where system-wide DLLs are kept. + * Further information The Emacs User manual describes Windows-specific issues in the @@ -206,17 +277,17 @@ See the end of the file for license conditions. In addition to the manual, there is a mailing list for help with Emacs here: - https://lists.gnu.org/mailman/listinfo/help-gnu-emacs + http://lists.gnu.org/mailman/listinfo/help-gnu-emacs - To ask questions on the mailing list, send email to + To ask questions on this mailing list, send email to help-gnu-emacs@gnu.org. - And a more specific one for issues related to the Windows port of - Emacs. For information about the list, see this Web page: + A mailing list for issuesspecifically related to the MS-Windows port + of Emacs is here: http://lists.gnu.org/mailman/listinfo/help-emacs-windows - To ask questions on the mailing list, send email to + To ask questions on this mailing list, send email to help-emacs-windows@gnu.org. * Reporting bugs @@ -224,11 +295,11 @@ See the end of the file for license conditions. If you encounter a bug in this port of Emacs, we would like to hear about it. First check the FAQ on the web page above to see if the bug is already known and if there are any workarounds. Then check whether - the bug has something to do with code in your .emacs file, e.g. by + the bug has something to do with code in your `.emacs' file, e.g. by invoking Emacs with the "-Q" option. If you decide that it is a bug in Emacs, use the built in bug - reporting facility to report it (from the menu; Help -> Send Bug Report). + reporting facility to report it (from the menu: Help -> Send Bug Report). If you have not yet configured Emacs for mail, then when you press C-c C-c to send the report, it will ask you to paste the text of the report into your mail client. If the bug is related to subprocesses, commit db436e93cae16b34b951c2f210705fbd30ad2922 Author: Noam Postavsky Date: Fri Nov 4 21:40:16 2016 -0400 Don't call debug on failed cl-assert Doing this causes problems when running ert tests, for instance (Bug#24778). The call to `debug` when `debug-on-error' is non-nil was introduced in 2015-02-14 "* lisp/emacs-lisp/cl*.el: Use define-inline and move some code...". * lisp/emacs-lisp/cl-preloaded.el (cl--assertion-failed): Don't call `debug' directly. diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index cd1d700..639ffa6 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -44,11 +44,9 @@ (define-error 'cl-assertion-failed (purecopy "Assertion failed")) (defun cl--assertion-failed (form &optional string sargs args) - (if debug-on-error - (debug `(cl-assertion-failed ,form ,string ,@sargs)) - (if string - (apply #'error string (append sargs args)) - (signal 'cl-assertion-failed `(,form ,@sargs))))) + (if string + (apply #'error string (append sargs args)) + (signal 'cl-assertion-failed `(,form ,@sargs)))) ;; When we load this (compiled) file during pre-loading, the cl--struct-class ;; code below will need to access the `cl-struct' info, since it's considered