commit 7366f80ab82c0acd6cf1c66b7ff020cd4a77a75c (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Thu Sep 17 10:48:39 2015 +0300 * doc/lispref/frames.texi (Cursor Parameters): Document 'x-stretch-cursor'. diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 629ee5c..0950a98 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1576,6 +1576,19 @@ means use a standard modification of the usual cursor type (solid box becomes hollow box, and bar becomes a narrower bar). @end defopt +@defopt x-stretch-cursor +This variable controls the width of the block cursor displayed on +extra-wide glyphs such as a tab or a stretch of white space. By +default, the block cursor is only as wide as the font's default +character, and will not cover all of the width of the glyph under it +if that glyph is extra-wide. A non-@code{nil} value of this variable +means draw the block cursor as wide as the glyph under it. The +default value is @code{nil}. + +This variable has no effect on text-mode frames, since the text-mode +cursor is drawn by the terminal out of Emacs's control. +@end defopt + @defopt blink-cursor-alist This variable specifies how to blink the cursor. Each element has the form @code{(@var{on-state} . @var{off-state})}. Whenever the cursor commit 8c8e6cd3dcfed8383d8f014e3681113ffde4b324 Author: Michael Albinus Date: Thu Sep 17 09:25:21 2015 +0200 ; Preserve formatting in docstring of dbusbind.c diff --git a/src/dbusbind.c b/src/dbusbind.c index fcb6ab8..181c7d0 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1233,20 +1233,20 @@ This is an internal function, it shall not be used outside dbus.el. The following usages are expected: `dbus-call-method', `dbus-call-method-asynchronously': - (dbus-message-internal + (dbus-message-internal dbus-message-type-method-call BUS SERVICE PATH INTERFACE METHOD HANDLER &optional :timeout TIMEOUT &rest ARGS) `dbus-send-signal': - (dbus-message-internal + (dbus-message-internal dbus-message-type-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS) `dbus-method-return-internal': - (dbus-message-internal + (dbus-message-internal dbus-message-type-method-return BUS SERVICE SERIAL &rest ARGS) `dbus-method-error-internal': - (dbus-message-internal + (dbus-message-internal dbus-message-type-error BUS SERVICE SERIAL &rest ARGS) usage: (dbus-message-internal &rest REST) */) commit e643aa95052c098a450ab05dd413adf0c1f62a72 Author: Paul Eggert Date: Wed Sep 16 22:42:57 2015 -0700 ; Use proper accents in Peter von der Ahé’s name diff --git a/admin/authors.el b/admin/authors.el index 0afb3a8..092da68 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -212,7 +212,7 @@ If REALNAME is nil, ignore that author.") "Michael McNamara" "Mike McEwan" "Nelson Jose dos Santos Ferreira" - "Peter von der Ahe" + "Peter von der Ahé" "Peter O'Gorman" "Piet van Oostrum" "Roland McGrath" diff --git a/etc/AUTHORS b/etc/AUTHORS index cf08cf8..f3adef4 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -3479,7 +3479,7 @@ Peter Stephenson: wrote vcursor.el Peter Tury: changed org.texi -Peter von der Ahe: changed gnus-ems.el +Peter von der Ahé: changed gnus-ems.el Peter Whaite: changed data.c diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index ce8e1b9..29ab978 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -7711,7 +7711,7 @@ (gnus-agent-fetch-selected-article): New function for gnus-select-article-hook or gnus-mark-article-hook. -2002-10-02 Peter von der Ahe +2002-10-02 Peter von der Ahé * gnus-ems.el (gnus-x-splash): Set coding-system-for-read to raw-text. diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index 8304f6f..3d1515e 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -118,7 +118,7 @@ This can be either \"inline\" or \"attachment\".") mm-uu-shar-extract) (forward ;; Thanks to Edward J. Sabol and - ;; Peter von der Ah\'e + ;; Peter von der Ahé "^-+ \\(Start of \\)?Forwarded message" "^-+ End \\(of \\)?forwarded message" mm-uu-forward-extract @@ -771,4 +771,8 @@ Assume text has been decoded if DECODED is non-nil." (provide 'mm-uu) +;; Local Variables: +;; coding: utf-8 +;; End: + ;;; mm-uu.el ends here commit 032ce1c7d1afb23e6b1265d91c5a97e45de071ce Author: Paul Eggert Date: Wed Sep 16 16:23:55 2015 -0700 Omit unnecessary \ before paren in C docstrings Although \( is needed in docstrings in Elisp code, it is not needed in docstrings in C code, since C function definitiions do not start with a parenthesis. The backslashes made the docstrings a bit harder to read and to format in columns. Also, some C docstrings had ( in column 1 and this did not appear to be causing any problems. So, simplify C docstrings by replacing \( with ( and \) with ). diff --git a/src/buffer.c b/src/buffer.c index 33f7996..530fe11 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1042,7 +1042,7 @@ DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, doc: /* Return a string that is the name of no existing buffer based on NAME. If there is no live buffer named NAME, then return NAME. Otherwise modify name by appending `', incrementing NUMBER -\(starting at 2) until an unused name is found, and then return that name. +(starting at 2) until an unused name is found, and then return that name. Optional second argument IGNORE specifies a name that is okay to use (if it is in the sequence to be tried) even if a buffer with that name exists. @@ -1385,7 +1385,7 @@ DEFUN ("buffer-chars-modified-tick", Fbuffer_chars_modified_tick, Sbuffer_chars_modified_tick, 0, 1, 0, doc: /* Return BUFFER's character-change tick counter. Each buffer has a character-change tick counter, which is set to the -value of the buffer's tick counter \(see `buffer-modified-tick'), each +value of the buffer's tick counter (see `buffer-modified-tick'), each time text in that buffer is inserted or deleted. By comparing the values returned by two individual calls of `buffer-chars-modified-tick', you can tell whether a character change occurred in that buffer in @@ -3791,10 +3791,10 @@ If omitted, BUFFER defaults to the current buffer. BEG and END may be integers or markers. The fourth arg FRONT-ADVANCE, if non-nil, makes the marker for the front of the overlay advance when text is inserted there -\(which means the text *is not* included in the overlay). +(which means the text *is not* included in the overlay). The fifth arg REAR-ADVANCE, if non-nil, makes the marker for the rear of the overlay advance when text is inserted there -\(which means the text *is* included in the overlay). */) +(which means the text *is* included in the overlay). */) (Lisp_Object beg, Lisp_Object end, Lisp_Object buffer, Lisp_Object front_advance, Lisp_Object rear_advance) { @@ -6014,7 +6014,7 @@ between 0.0 and 1.0, inclusive. */); doc: /* List of functions to call before each text change. Two arguments are passed to each function: the positions of the beginning and end of the range of old text to be changed. -\(For an insertion, the beginning and end are at the same place.) +(For an insertion, the beginning and end are at the same place.) No information is given about the length of the text after the change. Buffer changes made while executing the `before-change-functions' @@ -6031,7 +6031,7 @@ from happening repeatedly and making Emacs nonfunctional. */); Three arguments are passed to each function: the positions of the beginning and end of the range of changed text, and the length in chars of the pre-change text replaced by that range. -\(For an insertion, the pre-change length is zero; +(For an insertion, the pre-change length is zero; for a deletion, that length is the number of chars deleted, and the post-change beginning and end are at the same place.) @@ -6076,7 +6076,7 @@ was modified between BEG and END. PROPERTY is the property name, and VALUE is the old value. An entry (apply FUN-NAME . ARGS) means undo the change with -\(apply FUN-NAME ARGS). +(apply FUN-NAME ARGS). An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo in the active region. BEG and END is the range affected by this entry @@ -6236,7 +6236,7 @@ to the default frame line height. A value of nil means add no extra space. */) doc: /* Non-nil means show a cursor in non-selected windows. If nil, only shows a cursor in the selected window. If t, displays a cursor related to the usual cursor type -\(a solid box becomes hollow, a bar becomes a narrower bar). +(a solid box becomes hollow, a bar becomes a narrower bar). You can also specify the cursor type as in the `cursor-type' variable. Use Custom to set this variable and update the display." */); diff --git a/src/bytecode.c b/src/bytecode.c index 86d44ab..864db1a 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -2000,9 +2000,9 @@ syms_of_bytecode (void) DEFVAR_LISP ("byte-code-meter", Vbyte_code_meter, doc: /* A vector of vectors which holds a histogram of byte-code usage. -\(aref (aref byte-code-meter 0) CODE) indicates how many times the byte +(aref (aref byte-code-meter 0) CODE) indicates how many times the byte opcode CODE has been executed. -\(aref (aref byte-code-meter CODE1) CODE2), where CODE1 is not 0, +(aref (aref byte-code-meter CODE1) CODE2), where CODE1 is not 0, indicates how many times the byte opcodes CODE1 and CODE2 have been executed in succession. */); diff --git a/src/callproc.c b/src/callproc.c index 39f0eb6..e38844e 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -226,7 +226,7 @@ The program's input comes from file INFILE (nil means `/dev/null'). Insert output in DESTINATION before point; t means current buffer; nil for DESTINATION means discard it; 0 means discard and don't wait; and `(:file FILE)', where FILE is a file name string, means that it should be written to that file - \(if the file already exists it is overwritten). + (if the file already exists it is overwritten). DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case, REAL-BUFFER says what to do with standard output, as above, while STDERR-FILE says what to do with standard error in the child. @@ -1462,7 +1462,7 @@ This function searches `process-environment' for VARIABLE. If optional parameter ENV is a list, then search this list instead of `process-environment', and return t when encountering a negative entry -\(an entry for a variable with no value). */) +(an entry for a variable with no value). */) (Lisp_Object variable, Lisp_Object env) { char *value; diff --git a/src/category.c b/src/category.c index bb4a75d..400116f 100644 --- a/src/category.c +++ b/src/category.c @@ -464,7 +464,7 @@ Emacs treats a sequence of word constituent characters as a single word (i.e. finds no word boundary between them) only if they belong to the same script. But, exceptions are allowed in the following cases. -\(1) The case that characters are in different scripts is controlled +(1) The case that characters are in different scripts is controlled by the variable `word-combining-categories'. Emacs finds no word boundary between characters of different scripts @@ -478,7 +478,7 @@ For instance, to tell that Han characters followed by Hiragana characters can form a single word, the element `(?C . ?H)' should be in this list. -\(2) The case that character are in the same script is controlled by +(2) The case that character are in the same script is controlled by the variable `word-separating-categories'. Emacs finds a word boundary between characters of the same script diff --git a/src/chartab.c b/src/chartab.c index bd14c4d..274bb60 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -534,7 +534,7 @@ DEFUN ("char-table-parent", Fchar_table_parent, Schar_table_parent, The value is either nil or another char-table. If CHAR-TABLE holds nil for a given character, then the actual applicable value is inherited from the parent char-table -\(or from its parents, if necessary). */) +(or from its parents, if necessary). */) (Lisp_Object char_table) { CHECK_CHAR_TABLE (char_table); diff --git a/src/cmds.c b/src/cmds.c index a975a8e..7a575ae 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -108,7 +108,7 @@ right or to the left on the screen. This is in contrast with DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p", doc: /* Move N lines forward (backward if N is negative). Precisely, if point is on line I, move to the start of line I + N -\("start of line" in the logical order). +("start of line" in the logical order). If there isn't room, go as far as possible (no error). Returns the count of lines left to move. If moving forward, diff --git a/src/coding.c b/src/coding.c index d14e562..3fc6fb6 100644 --- a/src/coding.c +++ b/src/coding.c @@ -9800,7 +9800,7 @@ DEFUN ("find-operation-coding-system", Ffind_operation_coding_system, doc: /* Choose a coding system for an operation based on the target name. The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM). DECODING-SYSTEM is the coding system to use for decoding -\(in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system +(in case OPERATION does decoding), and ENCODING-SYSTEM is the coding system for encoding (in case OPERATION does encoding). The first argument OPERATION specifies an I/O primitive: @@ -11175,7 +11175,7 @@ the cdr part is used for encoding a text to be sent to a process. */); Table of extra Latin codes in the range 128..159 (inclusive). This is a vector of length 256. If Nth element is non-nil, the existence of code N in a file -\(or output of subprocess) doesn't prevent it to be detected as +(or output of subprocess) doesn't prevent it to be detected as a coding system of ISO 2022 variant which has a flag `accept-latin-extra-code' t (e.g. iso-latin-1) on reading a file or reading output of a subprocess. diff --git a/src/data.c b/src/data.c index 34265b7..eda6110 100644 --- a/src/data.c +++ b/src/data.c @@ -791,7 +791,7 @@ SUBR must be a built-in function. */) DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, doc: /* Return the interactive form of CMD or nil if none. If CMD is not a command, the return value is nil. -Value, if non-nil, is a list \(interactive SPEC). */) +Value, if non-nil, is a list (interactive SPEC). */) (Lisp_Object cmd) { Lisp_Object fun = indirect_function (cmd); /* Check cycles. */ @@ -1660,8 +1660,8 @@ DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable, 1, 1, "vMake Local Variable: ", doc: /* Make VARIABLE have a separate value in the current buffer. Other buffers will continue to share a common default value. -\(The buffer-local value of VARIABLE starts out as the same value -VARIABLE previously had. If VARIABLE was void, it remains void.\) +(The buffer-local value of VARIABLE starts out as the same value +VARIABLE previously had. If VARIABLE was void, it remains void.) Return VARIABLE. If the variable is already arranged to become local when set, diff --git a/src/dbusbind.c b/src/dbusbind.c index e5318fd..fcb6ab8 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1233,20 +1233,20 @@ This is an internal function, it shall not be used outside dbus.el. The following usages are expected: `dbus-call-method', `dbus-call-method-asynchronously': - \(dbus-message-internal + (dbus-message-internal dbus-message-type-method-call BUS SERVICE PATH INTERFACE METHOD HANDLER &optional :timeout TIMEOUT &rest ARGS) `dbus-send-signal': - \(dbus-message-internal + (dbus-message-internal dbus-message-type-signal BUS SERVICE PATH INTERFACE SIGNAL &rest ARGS) `dbus-method-return-internal': - \(dbus-message-internal + (dbus-message-internal dbus-message-type-method-return BUS SERVICE SERIAL &rest ARGS) `dbus-method-error-internal': - \(dbus-message-internal + (dbus-message-internal dbus-message-type-error BUS SERVICE SERIAL &rest ARGS) usage: (dbus-message-internal &rest REST) */) @@ -1796,7 +1796,7 @@ string which denotes a D-Bus interface, and MEMBER, also a string, is either a method, a signal or a property INTERFACE is offering. All arguments but BUS must not be nil. -The value in the hash table is a list of quadruple lists \((UNAME +The value in the hash table is a list of quadruple lists ((UNAME SERVICE PATH OBJECT [RULE]) ...). SERVICE is the service name as registered, UNAME is the corresponding unique name. In case of registered methods and properties, UNAME is nil. PATH is the object diff --git a/src/dispnew.c b/src/dispnew.c index 645d410..00d086e 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5665,7 +5665,7 @@ DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0, SECONDS may be a floating-point value, meaning that you can wait for a fraction of a second. Optional second arg MILLISECONDS specifies an additional wait period, in milliseconds; this is for backwards compatibility. -\(Not all operating systems support waiting for a fraction of a second.) */) +(Not all operating systems support waiting for a fraction of a second.) */) (Lisp_Object seconds, Lisp_Object milliseconds) { double duration = extract_float (seconds); diff --git a/src/doc.c b/src/doc.c index b6963d2..68d4367 100644 --- a/src/doc.c +++ b/src/doc.c @@ -716,7 +716,7 @@ is not on any keys. Each substring of the form \\=\\{MAPVAR} is replaced by a summary of the value of MAPVAR as a keymap. This summary is similar to the one produced by `describe-bindings'. The summary ends in two newlines -\(used by the helper function `help-make-xrefs' to find the end of the +(used by the helper function `help-make-xrefs' to find the end of the summary). Each substring of the form \\=\\ specifies the use of MAPVAR diff --git a/src/editfns.c b/src/editfns.c index 2080b53..e6f144e 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3627,7 +3627,7 @@ save_restriction_restore (Lisp_Object data) DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0, doc: /* Execute BODY, saving and restoring current buffer's restrictions. The buffer's restrictions make parts of the beginning and end invisible. -\(They are set up with `narrow-to-region' and eliminated with `widen'.) +(They are set up with `narrow-to-region' and eliminated with `widen'.) This special form, `save-restriction', saves the current buffer's restrictions when it is entered, and restores them when it is exited. So any `narrow-to-region' within BODY lasts only until the end of the form. diff --git a/src/eval.c b/src/eval.c index b42f904..ac98ca1 100644 --- a/src/eval.c +++ b/src/eval.c @@ -705,7 +705,7 @@ If SYMBOL has a local binding, then this form affects the local binding. This is usually not what you want. Thus, if you need to load a file defining variables, with this form or with `defconst' or `defcustom', you should always load that file _outside_ any bindings -for these variables. \(`defconst' and `defcustom' behave similarly in +for these variables. (`defconst' and `defcustom' behave similarly in this respect.) The optional argument DOCSTRING is a documentation string for the @@ -1188,7 +1188,7 @@ suppresses the debugger). When a handler handles an error, control returns to the `condition-case' and it executes the handler's BODY... with VAR bound to (ERROR-SYMBOL . SIGNAL-DATA) from the error. -\(If VAR is nil, the handler can't access that information.) +(If VAR is nil, the handler can't access that information.) Then the value of the last BODY form is returned from the `condition-case' expression. @@ -2366,7 +2366,7 @@ may be nil, a function, or a list of functions. Call each function in order with arguments ARGS, stopping at the first one that returns nil, and return nil. Otherwise (if all functions return non-nil, or if there are no functions to call), return non-nil -\(do not rely on the precise return value in this case). +(do not rely on the precise return value in this case). Do not use `make-local-variable' to make a hook variable buffer-local. Instead, use `add-hook' and specify t for the LOCAL argument. diff --git a/src/fileio.c b/src/fileio.c index 69933cc..e4b255a 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -451,7 +451,7 @@ DEFUN ("unhandled-file-name-directory", Funhandled_file_name_directory, A `directly usable' directory name is one that may be used without the intervention of any file handler. If FILENAME is a directly usable file itself, return -\(file-name-directory FILENAME). +(file-name-directory FILENAME). If FILENAME refers to a file which is not accessible from a local process, then this should return nil. The `call-process' and `start-process' functions use this function to @@ -742,7 +742,7 @@ DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0, doc: /* Generate temporary file name (string) starting with PREFIX (a string). The Emacs process number forms part of the result, so there is no danger of generating a name being used by another Emacs process -\(so long as only a single host can access the containing directory...). +(so long as only a single host can access the containing directory...). This function tries to choose a name that has no existing file. For this to work, PREFIX should be an absolute file name. @@ -758,7 +758,7 @@ normally use `make-temp-file' instead. */) DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, doc: /* Convert filename NAME to absolute, and canonicalize it. Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative -\(does not start with slash or tilde); both the directory name and +(does not start with slash or tilde); both the directory name and a directory's file name are accepted. If DEFAULT-DIRECTORY is nil or missing, the current buffer's value of `default-directory' is used. NAME should be a string that is a valid file name for the underlying @@ -776,8 +776,8 @@ See also the function `substitute-in-file-name'. For technical reasons, this function can return correct but non-intuitive results for the root directory; for instance, -\(expand-file-name ".." "/") returns "/..". For this reason, use -\(directory-file-name (file-name-directory dirname)) to traverse a +(expand-file-name ".." "/") returns "/..". For this reason, use +(directory-file-name (file-name-directory dirname)) to traverse a filesystem tree, not (expand-file-name ".." dirname). */) (Lisp_Object name, Lisp_Object default_directory) { @@ -1460,7 +1460,7 @@ filesystem tree, not (expand-file-name ".." dirname). */) DEAFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, "Convert FILENAME to absolute, and canonicalize it.\n\ Second arg DEFAULT is directory to start with if FILENAME is relative\n\ -\(does not start with slash); if DEFAULT is nil or missing,\n\ +(does not start with slash); if DEFAULT is nil or missing,\n\ the current buffer's value of default-directory is used.\n\ Filenames containing `.' or `..' as components are simplified;\n\ initial `~/' expands to your home directory.\n\ @@ -2469,7 +2469,7 @@ Use `file-symlink-p' to test for such links. */) DEFUN ("file-executable-p", Ffile_executable_p, Sfile_executable_p, 1, 1, 0, doc: /* Return t if FILENAME can be executed by you. For a directory, this means you can access files in that directory. -\(It is generally better to use `file-accessible-directory-p' for that +(It is generally better to use `file-accessible-directory-p' for that purpose, though.) */) (Lisp_Object filename) { @@ -5306,8 +5306,8 @@ DEFUN ("set-visited-file-modtime", Fset_visited_file_modtime, Useful if the buffer was not read from the file normally or if the file itself has been changed for some known benign reason. An argument specifies the modification time value to use -\(instead of that of the visited file), in the form of a list -\(HIGH LOW USEC PSEC) or an integer flag as returned by +(instead of that of the visited file), in the form of a list +(HIGH LOW USEC PSEC) or an integer flag as returned by `visited-file-modtime'. */) (Lisp_Object time_flag) { diff --git a/src/floatfns.c b/src/floatfns.c index 63d35b8..46eb85f 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -170,7 +170,7 @@ Cause an error if X1 or X2 is not a float. */) DEFUN ("frexp", Ffrexp, Sfrexp, 1, 1, 0, doc: /* Get significand and exponent of a floating point number. Breaks the floating point number X into its binary significand SGNFCAND -\(a floating point value between 0.5 (included) and 1.0 (excluded)) +(a floating point value between 0.5 (included) and 1.0 (excluded)) and an integral exponent EXP for 2, such that: X = SGNFCAND * 2^EXP @@ -454,7 +454,7 @@ With optional DIVISOR, return the nearest integer to ARG/DIVISOR. Rounding a value equidistant between two integers may choose the integer closer to zero, or it may prefer an even integer, depending on -your machine. For example, \(round 2.5\) can return 3 on some +your machine. For example, (round 2.5) can return 3 on some systems, but 2 on others. */) (Lisp_Object arg, Lisp_Object divisor) { @@ -491,7 +491,7 @@ fmod_float (Lisp_Object x, Lisp_Object y) DEFUN ("fceiling", Ffceiling, Sfceiling, 1, 1, 0, doc: /* Return the smallest integer no less than ARG, as a float. -\(Round toward +inf.\) */) +(Round toward +inf.) */) (Lisp_Object arg) { double d = extract_float (arg); @@ -501,7 +501,7 @@ DEFUN ("fceiling", Ffceiling, Sfceiling, 1, 1, 0, DEFUN ("ffloor", Fffloor, Sffloor, 1, 1, 0, doc: /* Return the largest integer no greater than ARG, as a float. -\(Round towards -inf.\) */) +(Round towards -inf.) */) (Lisp_Object arg) { double d = extract_float (arg); diff --git a/src/fns.c b/src/fns.c index aa917ac..b31bd81 100644 --- a/src/fns.c +++ b/src/fns.c @@ -224,7 +224,7 @@ DEFUN ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0, The arguments START1, END1, START2, and END2, if non-nil, are positions specifying which parts of STR1 or STR2 to compare. In string STR1, compare the part between START1 (inclusive) and END1 -\(exclusive). If START1 is nil, it defaults to 0, the beginning of +(exclusive). If START1 is nil, it defaults to 0, the beginning of the string; if END1 is nil, it defaults to the length of the string. Likewise, in string STR2, compare the part between START2 and END2. Like in `substring', negative values are counted from the end. @@ -347,8 +347,8 @@ This function obeys the conventions for collation order in your locale settings. For example, punctuation and whitespace characters might be considered less significant for sorting: -\(sort '\("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp) - => \("11" "1 1" "1.1" "12" "1 2" "1.2") +(sort '("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp) + => ("11" "1 1" "1.1" "12" "1 2" "1.2") The optional argument LOCALE, a string, overrides the setting of your current locale identifier for collation. The value is system @@ -393,7 +393,7 @@ settings. For example, characters with different coding points but the same meaning might be considered as equal, like different grave accent Unicode characters: -\(string-collate-equalp \(string ?\\uFF40) \(string ?\\u1FEF)) +(string-collate-equalp (string ?\\uFF40) (string ?\\u1FEF)) => t The optional argument LOCALE, a string, overrides the setting of your @@ -1026,7 +1026,7 @@ to a multibyte character. In this case, the returned string is a newly created string with no text properties. If STRING is multibyte or entirely ASCII, it is returned unchanged. In particular, when STRING is unibyte and entirely ASCII, the returned string is unibyte. -\(When the characters are all ASCII, Emacs primitives will treat the +(When the characters are all ASCII, Emacs primitives will treat the string the same way whether it is unibyte or multibyte.) */) (Lisp_Object string) { @@ -1225,14 +1225,14 @@ validate_subarray (Lisp_Object array, Lisp_Object from, Lisp_Object to, DEFUN ("substring", Fsubstring, Ssubstring, 1, 3, 0, doc: /* Return a new string whose contents are a substring of STRING. The returned string consists of the characters between index FROM -\(inclusive) and index TO (exclusive) of STRING. FROM and TO are +(inclusive) and index TO (exclusive) of STRING. FROM and TO are zero-indexed: 0 means the first character of STRING. Negative values are counted from the end of STRING. If TO is nil, the substring runs to the end of STRING. The STRING argument may also be a vector. In that case, the return value is a new vector that contains the elements between index FROM -\(inclusive) and index TO (exclusive) of that vector argument. +(inclusive) and index TO (exclusive) of that vector argument. With one argument, just copy STRING (with properties, if any). */) (Lisp_Object string, Lisp_Object from, Lisp_Object to) @@ -2051,7 +2051,7 @@ merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred) DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0, doc: /* Extract a value from a property list. PLIST is a property list, which is a list of the form -\(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value +(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value corresponding to the given PROP, or nil if PROP is not one of the properties on the list. This function never signals an error. */) (Lisp_Object plist, Lisp_Object prop) @@ -2086,7 +2086,7 @@ This is the last value stored with `(put SYMBOL PROPNAME VALUE)'. */) DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0, doc: /* Change value in PLIST of PROP to VAL. PLIST is a property list, which is a list of the form -\(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol and VAL is any object. +(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol and VAL is any object. If PROP is already a property on the list, its value is set to VAL, otherwise the new PROP VAL pair is added. The new plist is returned; use `(setq x (plist-put x prop val))' to be sure to use the new value. @@ -2130,7 +2130,7 @@ It can be retrieved with `(get SYMBOL PROPNAME)'. */) DEFUN ("lax-plist-get", Flax_plist_get, Slax_plist_get, 2, 2, 0, doc: /* Extract a value from a property list, comparing with `equal'. PLIST is a property list, which is a list of the form -\(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value +(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value corresponding to the given PROP, or nil if PROP is not one of the properties on the list. */) (Lisp_Object plist, Lisp_Object prop) @@ -2155,7 +2155,7 @@ one of the properties on the list. */) DEFUN ("lax-plist-put", Flax_plist_put, Slax_plist_put, 3, 3, 0, doc: /* Change value in PLIST of PROP to VAL, comparing with `equal'. PLIST is a property list, which is a list of the form -\(PROP1 VALUE1 PROP2 VALUE2 ...). PROP and VAL are any objects. +(PROP1 VALUE1 PROP2 VALUE2 ...). PROP and VAL are any objects. If PROP is already a property on the list, its value is set to VAL, otherwise the new PROP VAL pair is added. The new plist is returned; use `(setq x (lax-plist-put x prop val))' to be sure to use the new value. @@ -2867,7 +2867,7 @@ The normal messages at start and end of loading FILENAME are suppressed. */) DEFUN ("plist-member", Fplist_member, Splist_member, 2, 2, 0, doc: /* Return non-nil if PLIST has the property PROP. PLIST is a property list, which is a list of the form -\(PROP1 VALUE1 PROP2 VALUE2 ...\). PROP is a symbol. +(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol. Unlike `plist-get', this allows you to distinguish between a missing property and a property with the value nil. The value is actually the tail of PLIST whose car is PROP. */) diff --git a/src/font.c b/src/font.c index 8e06532..ce144e7 100644 --- a/src/font.c +++ b/src/font.c @@ -4068,7 +4068,7 @@ DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1, FONT is a font name, a font-spec, a font-entity, or a font-object. The return value is a list of the form -\(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH) +(:family FAMILY :height HEIGHT :weight WEIGHT :slant SLANT :width WIDTH) where FAMILY, HEIGHT, WEIGHT, SLANT, and WIDTH are face attribute values compatible with `set-face-attribute'. Some of these key-attribute pairs @@ -4749,15 +4749,15 @@ ASCENT, DESCENT, SPACE-WIDTH, AVERAGE-WIDTH are metrics of the font in pixels. CAPABILITY is a list whose first element is a symbol representing the -font format \(x, opentype, truetype, type1, pcf, or bdf) and the +font format (x, opentype, truetype, type1, pcf, or bdf) and the remaining elements describe the details of the font capability. If the font is OpenType font, the form of the list is - \(opentype GSUB GPOS) + (opentype GSUB GPOS) where GSUB shows which "GSUB" features the font supports, and GPOS shows which "GPOS" features the font supports. Both GSUB and GPOS are lists of the format: - \((SCRIPT (LANGSYS FEATURE ...) ...) ...) + ((SCRIPT (LANGSYS FEATURE ...) ...) ...) If the font is not OpenType font, currently the length of the form is one. @@ -5043,11 +5043,11 @@ where as follows: If the font is OpenType font, the form of the list is - \(opentype GSUB GPOS) + (opentype GSUB GPOS) where GSUB shows which "GSUB" features the font supports, and GPOS shows which "GPOS" features the font supports. Both GSUB and GPOS are lists of the form: - \((SCRIPT (LANGSYS FEATURE ...) ...) ...) + ((SCRIPT (LANGSYS FEATURE ...) ...) ...) where SCRIPT is a symbol representing OpenType script tag. @@ -5359,7 +5359,7 @@ where ENCODING is a charset or a char-table, and REPERTORY is a charset, a char-table, or nil. If ENCODING and REPERTORY are the same, the element can have the form -\(REGEXP . ENCODING). +(REGEXP . ENCODING). ENCODING is for converting a character to a glyph code of the font. If ENCODING is a charset, encoding a character by the charset gives diff --git a/src/frame.c b/src/frame.c index b782b09..0e95749 100644 --- a/src/frame.c +++ b/src/frame.c @@ -5175,7 +5175,7 @@ keep it unchanged if this option is either t or a list containing `vertical-scroll-bars'. The default value is \\='(tool-bar-lines) on Lucid, Motif and Windows -\(which means that adding/removing a tool bar does not change the frame +(which means that adding/removing a tool bar does not change the frame height), nil on all other window systems including GTK+ (which means that changing any of the parameters listed above may change the size of the frame), and t otherwise (which means the frame size never changes diff --git a/src/keyboard.c b/src/keyboard.c index ccd3405..966af69 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11332,7 +11332,7 @@ See Info node `(elisp)Multiple Terminals'. */); DEFVAR_BOOL ("cannot-suspend", cannot_suspend, doc: /* Non-nil means to always spawn a subshell instead of suspending. -\(Even if the operating system has support for stopping a process.\) */); +(Even if the operating system has support for stopping a process.) */); cannot_suspend = false; DEFVAR_BOOL ("menu-prompting", menu_prompting, @@ -11538,7 +11538,7 @@ immediately after running `post-command-hook'. */); DEFVAR_LISP ("input-method-function", Vinput_method_function, doc: /* If non-nil, the function that implements the current input method. It's called with one argument, a printing character that was just read. -\(That means a character with code 040...0176.) +(That means a character with code 040...0176.) Typically this function uses `read-event' to read additional events. When it does so, it should first bind `input-method-function' to nil so it will not be called recursively. diff --git a/src/keymap.c b/src/keymap.c index 3668d4b..6a8d129 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1687,7 +1687,7 @@ DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0, KEYS is a string or vector, a sequence of keystrokes. The binding is probably a symbol with a function definition. This function's return values are the same as those of `lookup-key' -\(which see). +(which see). If optional argument ACCEPT-DEFAULT is non-nil, recognize default bindings; see the description of `lookup-key' for more details about this. */) @@ -2492,7 +2492,7 @@ If FIRSTONLY is the symbol `non-ascii', return the first binding found, no matter what it is. If FIRSTONLY has another non-nil value, prefer bindings that use the modifier key specified in `where-is-preferred-modifier' -\(or their meta variants) and entirely reject menu bindings. +(or their meta variants) and entirely reject menu bindings. If optional 4th arg NOINDIRECT is non-nil, don't extract the commands inside menu-items. This makes it possible to search for a menu-item itself. @@ -2723,7 +2723,7 @@ looked up in BUFFER. The optional argument PREFIX, if non-nil, should be a key sequence; then we display only bindings that start with that prefix. The optional argument MENUS, if non-nil, says to mention menu bindings. -\(Ordinarily these are omitted from the output.) */) +(Ordinarily these are omitted from the output.) */) (Lisp_Object buffer, Lisp_Object prefix, Lisp_Object menus) { Lisp_Object outbuf, shadow; diff --git a/src/lread.c b/src/lread.c index 6099545..bceec4b 100644 --- a/src/lread.c +++ b/src/lread.c @@ -4512,7 +4512,7 @@ customize `jka-compr-load-suffixes' rather than the present variable. */); Each element looks like (REGEXP-OR-FEATURE FUNCS...). REGEXP-OR-FEATURE is either a regular expression to match file names, or -a symbol \(a feature name). +a symbol (a feature name). When `load' is run and the file-name argument matches an element's REGEXP-OR-FEATURE, or when `provide' is run and provides the symbol diff --git a/src/menu.c b/src/menu.c index e36fe26..dc82809 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1129,7 +1129,7 @@ If POSITION is t, it means to use the current mouse position. MENU is a specifier for a menu. For the simplest case, MENU is a keymap. The menu items come from key bindings that have a menu string as well as a definition; actually, the "definition" in such a key binding looks like -\(STRING . REAL-DEFINITION). To give the menu a title, put a string into +(STRING . REAL-DEFINITION). To give the menu a title, put a string into the keymap as a top-level element. If REAL-DEFINITION is nil, that puts a nonselectable string in the menu. @@ -1491,7 +1491,7 @@ The return value is VALUE from the chosen item. An ITEM may also be just a string--that makes a nonselectable item. An ITEM may also be nil--that means to put all preceding items on the left of the dialog box and all following items on the right. -\(By default, approximately half appear on each side.) +(By default, approximately half appear on each side.) If HEADER is non-nil, the frame title for the box is "Information", otherwise it is "Question". diff --git a/src/minibuf.c b/src/minibuf.c index cf0cbca..4e5c17d 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -916,7 +916,7 @@ INITIAL-CONTENTS argument in more detail. It is only relevant when studying existing code, or when HIST is a cons. If non-nil, INITIAL-CONTENTS is a string to be inserted into the minibuffer before reading input. Normally, point is put at the end of that string. -However, if INITIAL-CONTENTS is \(STRING . POSITION), the initial +However, if INITIAL-CONTENTS is (STRING . POSITION), the initial input is STRING, but point is placed at _one-indexed_ position POSITION in the minibuffer. Any integer value less than or equal to one puts point at the beginning of the string. *Note* that this @@ -996,7 +996,7 @@ DEFUN ("read-no-blanks-input", Fread_no_blanks_input, Sread_no_blanks_input, 1, Prompt with PROMPT. Whitespace terminates the input. If INITIAL is non-nil, it should be a string, which is used as initial input, with point positioned at the end, so that SPACE will accept the input. -\(Actually, INITIAL can also be a cons of a string and an integer. +(Actually, INITIAL can also be a cons of a string and an integer. Such values are treated as in `read-from-minibuffer', but are normally not useful in this function.) Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits diff --git a/src/nsfns.m b/src/nsfns.m index 9c805ac..ad71a50 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1639,7 +1639,7 @@ DEFUN ("x-server-max-request-size", Fx_server_max_request_size, DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, doc: /* Return the "vendor ID" string of Nextstep display server TERMINAL. -\(Labeling every distributor as a "vendor" embodies the false assumption +(Labeling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). @@ -1816,7 +1816,7 @@ DISPLAY is the name of the display to connect to. Optional second arg XRM-STRING is a string of resources in xrdb format. If the optional third arg MUST-SUCCEED is non-nil, terminate Emacs if we can't open the connection. -\(In the Nextstep version, the last two arguments are currently ignored.) */) +(In the Nextstep version, the last two arguments are currently ignored.) */) (Lisp_Object display, Lisp_Object resource_string, Lisp_Object must_succeed) { struct ns_display_info *dpyinfo; @@ -2289,7 +2289,7 @@ x_get_focus_frame (struct frame *frame) DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, doc: /* Internal function called by `color-defined-p', which see. -\(Note that the Nextstep version of this function ignores FRAME.) */) +(Note that the Nextstep version of this function ignores FRAME.) */) (Lisp_Object color, Lisp_Object frame) { NSColor * col; diff --git a/src/nsselect.m b/src/nsselect.m index 918fb55..5579cc5 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -316,7 +316,7 @@ DEFUN ("ns-own-selection-internal", Fns_own_selection_internal, Sns_own_selection_internal, 2, 2, 0, doc: /* Assert an X selection of type SELECTION and value VALUE. SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names, since that's what X expects.) +(Those are literal upper-case symbol names, since that's what X expects.) VALUE is typically a string, or a cons of two markers, but may be anything that the functions on `selection-converter-alist' know about. */) (Lisp_Object selection, Lisp_Object value) @@ -414,7 +414,7 @@ DEFUN ("ns-selection-owner-p", Fns_selection_owner_p, Sns_selection_owner_p, doc: /* Whether the current Emacs process owns the given X Selection. The arg should be the name of the selection in question, typically one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names, since that's what X expects.) +(Those are literal upper-case symbol names, since that's what X expects.) For convenience, the symbol nil is the same as `PRIMARY', and t is the same as `SECONDARY'. */) (Lisp_Object selection) @@ -433,7 +433,7 @@ DEFUN ("ns-get-selection", Fns_get_selection, Sns_get_selection, 2, 2, 0, doc: /* Return text selected from some X window. SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names, since that's what X expects.) +(Those are literal upper-case symbol names, since that's what X expects.) TARGET-TYPE is the type of data desired, typically `STRING'. */) (Lisp_Object selection_name, Lisp_Object target_type) { diff --git a/src/print.c b/src/print.c index 94f3fcd..3c3dca7 100644 --- a/src/print.c +++ b/src/print.c @@ -2198,7 +2198,7 @@ Also print formfeeds as `\\f'. */); DEFVAR_BOOL ("print-escape-nonascii", print_escape_nonascii, doc: /* Non-nil means print unibyte non-ASCII chars in strings as \\OOO. -\(OOO is the octal representation of the character code.) +(OOO is the octal representation of the character code.) Only single-byte characters are affected, and only in `prin1'. When the output goes in a multibyte buffer, this feature is enabled regardless of the value of the variable. */); @@ -2206,7 +2206,7 @@ enabled regardless of the value of the variable. */); DEFVAR_BOOL ("print-escape-multibyte", print_escape_multibyte, doc: /* Non-nil means print multibyte characters in strings as \\xXXXX. -\(XXXX is the hex representation of the character code.) +(XXXX is the hex representation of the character code.) This affects only `prin1'. */); print_escape_multibyte = 0; diff --git a/src/process.c b/src/process.c index ed5f4c0..55f31a0 100644 --- a/src/process.c +++ b/src/process.c @@ -957,7 +957,7 @@ DEFUN ("process-command", Fprocess_command, Sprocess_command, 1, 1, 0, This is a list of strings, the first string being the program executed and the rest of the strings being the arguments given to it. For a network or serial process, this is nil (process is running) or t -\(process is stopped). */) +(process is stopped). */) (register Lisp_Object process) { CHECK_PROCESS (process); @@ -2674,7 +2674,7 @@ is not given or nil, 1 stopbit is used. :flowcontrol FLOWCONTROL -- FLOWCONTROL determines the type of flowcontrol to be used, which is either nil (don't use flowcontrol), the symbol `hw' (use RTS/CTS hardware flowcontrol), or the symbol `sw' -\(use XON/XOFF software flowcontrol). If FLOWCONTROL is not given, no +(use XON/XOFF software flowcontrol). If FLOWCONTROL is not given, no flowcontrol is used. `serial-process-configure' is called by `make-serial-process' for the @@ -2682,12 +2682,12 @@ initial configuration of the serial port. Examples: -\(serial-process-configure :process "/dev/ttyS0" :speed 1200) +(serial-process-configure :process "/dev/ttyS0" :speed 1200) -\(serial-process-configure +(serial-process-configure :buffer "COM1" :stopbits 1 :parity \\='odd :flowcontrol \\='hw) -\(serial-process-configure :port "\\\\.\\COM13" :bytesize 7) +(serial-process-configure :port "\\\\.\\COM13" :bytesize 7) usage: (serial-process-configure &rest ARGS) */) (ptrdiff_t nargs, Lisp_Object *args) @@ -2781,13 +2781,13 @@ is available via the function `process-contact'. Examples: -\(make-serial-process :port "/dev/ttyS0" :speed 9600) +(make-serial-process :port "/dev/ttyS0" :speed 9600) -\(make-serial-process :port "COM1" :speed 115200 :stopbits 2) +(make-serial-process :port "COM1" :speed 115200 :stopbits 2) -\(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd) +(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd) -\(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil) +(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil) usage: (make-serial-process &rest ARGS) */) (ptrdiff_t nargs, Lisp_Object *args) @@ -7296,7 +7296,7 @@ DEFUN ("process-attributes", Fprocess_attributes, Value is an alist where each element is a cons cell of the form - \(KEY . VALUE) + (KEY . VALUE) If this functionality is unsupported, the value is nil. diff --git a/src/search.c b/src/search.c index 106a462..8c9714e 100644 --- a/src/search.c +++ b/src/search.c @@ -2784,7 +2784,7 @@ if the last match was on a buffer; integers or nil if a string was matched. Use `set-match-data' to reinstate the data in this list. If INTEGERS (the optional first argument) is non-nil, always use -integers \(rather than markers) to represent buffer positions. In +integers (rather than markers) to represent buffer positions. In this case, and if the last match was in a buffer, the buffer will get stored as one additional element at the end of the list. diff --git a/src/syntax.c b/src/syntax.c index 55a4ba0..3bd301f 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1098,7 +1098,7 @@ DEFUN ("string-to-syntax", Fstring_to_syntax, Sstring_to_syntax, 1, 1, 0, doc: /* Convert a syntax descriptor STRING into a raw syntax descriptor. STRING should be a string of the form allowed as argument of `modify-syntax-entry'. The return value is a raw syntax descriptor: a -cons cell \(CODE . MATCHING-CHAR) which can be used, for example, as +cons cell (CODE . MATCHING-CHAR) which can be used, for example, as the value of a `syntax-table' text property. */) (Lisp_Object string) { diff --git a/src/textprop.c b/src/textprop.c index 3f7c8d1..6758d4d 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1494,7 +1494,7 @@ DEFUN ("remove-text-properties", Fremove_text_properties, doc: /* Remove some properties from text from START to END. The third argument PROPERTIES is a property list whose property names specify the properties to remove. -\(The values stored in PROPERTIES are ignored.) +(The values stored in PROPERTIES are ignored.) If the optional fourth argument OBJECT is a buffer (or nil, which means the current buffer), START and END are buffer positions (integers or markers). If OBJECT is a string, START and END are 0-based indices into it. diff --git a/src/w16select.c b/src/w16select.c index 96f8437..70b9dd0 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -686,7 +686,7 @@ For MS-Windows and MS-DOS: When sending or receiving text via selection and clipboard, the text is encoded or decoded by this coding system. The default value is the current system default encoding on 9x/Me, `utf-16le-dos' -\(Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS. +(Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS. For X Windows: When sending text via selection and clipboard, if the target diff --git a/src/w32fns.c b/src/w32fns.c index 48218e3..99fd3ba 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5305,7 +5305,7 @@ x_get_focus_frame (struct frame *frame) DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, doc: /* Internal function called by `color-defined-p', which see. -\(Note that the Nextstep version of this function ignores FRAME.) */) +(Note that the Nextstep version of this function ignores FRAME.) */) (Lisp_Object color, Lisp_Object frame) { XColor foo; @@ -5447,7 +5447,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, doc: /* Return the "vendor ID" string of the GUI software on TERMINAL. -\(Labeling every distributor as a "vendor" embodies the false assumption +(Labeling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) For GNU and Unix systems, this queries the X server software; for @@ -5850,7 +5850,7 @@ DISPLAY is the name of the display to connect to. Optional second arg XRM-STRING is a string of resources in xrdb format. If the optional third arg MUST-SUCCEED is non-nil, terminate Emacs if we can't open the connection. -\(In the Nextstep version, the last two arguments are currently ignored.) */) +(In the Nextstep version, the last two arguments are currently ignored.) */) (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed) { unsigned char *xrm_option; diff --git a/src/window.c b/src/window.c index f1af68e..42a2ca6 100644 --- a/src/window.c +++ b/src/window.c @@ -641,7 +641,7 @@ DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combinatio WINDOW must be a valid window used in horizontal or vertical combination. If the return value is nil, child windows of WINDOW can be recombined with WINDOW's siblings. A return value of t means that child windows of -WINDOW are never \(re-)combined with WINDOW's siblings. */) +WINDOW are never (re-)combined with WINDOW's siblings. */) (Lisp_Object window) { struct window *w; @@ -658,7 +658,7 @@ DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_windo WINDOW must be a valid window used in horizontal or vertical combination. If LIMIT is nil, child windows of WINDOW can be recombined with WINDOW's siblings. LIMIT t means that child windows of WINDOW are never -\(re-)combined with WINDOW's siblings. Other values are reserved for +(re-)combined with WINDOW's siblings. Other values are reserved for future use. */) (Lisp_Object window, Lisp_Object limit) { @@ -1312,7 +1312,7 @@ DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p, WINDOW must be a live window and defaults to the selected one. COORDINATES is a cons of the form (X . Y), X and Y being distances measured in characters from the upper-left corner of the frame. -\(0 . 0) denotes the character in the upper left corner of the +(0 . 0) denotes the character in the upper left corner of the frame. If COORDINATES are in the text portion of WINDOW, the coordinates relative to the window are returned. @@ -1696,7 +1696,7 @@ of the window. The remaining elements are omitted if the character after POS is fully visible; otherwise, RTOP and RBOT are the number of pixels off-window at the top and bottom of the screen line ("row") containing POS, ROWH is the visible height of that row, and VPOS is the row number -\(zero-based). */) +(zero-based). */) (Lisp_Object pos, Lisp_Object window, Lisp_Object partially) { struct window *w; diff --git a/src/xdisp.c b/src/xdisp.c index a3224e2..3eff61f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21038,7 +21038,7 @@ window-specific overlays, which can affect the results. Strong directional characters `L', `R', and `AL' can have their intrinsic directionality overridden by directional override -control characters RLO \(u+202e) and LRO \(u+202d). See the +control characters RLO (u+202e) and LRO (u+202d). See the function `get-char-code-property' for a way to inquire about the `bidi-class' property of a character. */) (Lisp_Object from, Lisp_Object to, Lisp_Object object) @@ -30994,18 +30994,18 @@ This variable is not guaranteed to be accurate except while processing DEFVAR_LISP ("frame-title-format", Vframe_title_format, doc: /* Template for displaying the title bar of visible frames. -\(Assuming the window manager supports this feature.) +(Assuming the window manager supports this feature.) This variable has the same structure as `mode-line-format', except that the %c and %l constructs are ignored. It is used only on frames for -which no explicit name has been set \(see `modify-frame-parameters'). */); +which no explicit name has been set (see `modify-frame-parameters'). */); DEFVAR_LISP ("icon-title-format", Vicon_title_format, doc: /* Template for displaying the title bar of an iconified frame. -\(Assuming the window manager supports this feature.) +(Assuming the window manager supports this feature.) This variable has the same structure as `mode-line-format' (which see), and is used only on frames for which no explicit name has been set -\(see `modify-frame-parameters'). */); +(see `modify-frame-parameters'). */); Vicon_title_format = Vframe_title_format = listn (CONSTYPE_PURE, 3, @@ -31064,9 +31064,9 @@ A positive number means delay autoselection by that many seconds: a window is autoselected only after the mouse has remained in that window for the duration of the delay. A negative number has a similar effect, but causes windows to be -autoselected only after the mouse has stopped moving. \(Because of +autoselected only after the mouse has stopped moving. (Because of the way Emacs compares mouse events, you will occasionally wait twice -that time before the window gets selected.\) +that time before the window gets selected.) Any other value means to autoselect window instantaneously when the mouse pointer enters it. diff --git a/src/xfaces.c b/src/xfaces.c index 453fd58..94f3c4d 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -709,10 +709,10 @@ Optional THOROUGHLY non-nil means try to free unused fonts, too. */) DEFUN ("bitmap-spec-p", Fbitmap_spec_p, Sbitmap_spec_p, 1, 1, 0, doc: /* Value is non-nil if OBJECT is a valid bitmap specification. A bitmap specification is either a string, a file name, or a list -\(WIDTH HEIGHT DATA) where WIDTH is the pixel width of the bitmap, +(WIDTH HEIGHT DATA) where WIDTH is the pixel width of the bitmap, HEIGHT is its height, and DATA is a string containing the bits of the pixmap. Bits are stored row by row, each row occupies -\(WIDTH + 7)/8 bytes. */) +(WIDTH + 7)/8 bytes. */) (Lisp_Object object) { bool pixmap_p = false; @@ -4631,8 +4631,8 @@ DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector, that a face containing all the attributes in ATTRS, when merged with the default face for display, can be represented in a way that's - \(1) different in appearance than the default face, and - \(2) `close in spirit' to what the attributes specify, if not exact. */ + (1) different in appearance than the default face, and + (2) `close in spirit' to what the attributes specify, if not exact. */ static bool x_supports_face_attributes_p (struct frame *f, @@ -4731,8 +4731,8 @@ x_supports_face_attributes_p (struct frame *f, that a face containing all the attributes in ATTRS, when merged with the default face for display, can be represented in a way that's - \(1) different in appearance than the default face, and - \(2) `close in spirit' to what the attributes specify, if not exact. + (1) different in appearance than the default face, and + (2) `close in spirit' to what the attributes specify, if not exact. Point (2) implies that a `:weight black' attribute will be satisfied by any terminal that can display bold, and a `:foreground "yellow"' as @@ -4914,8 +4914,8 @@ The definition of `supported' is somewhat heuristic, but basically means that a face containing all the attributes in ATTRIBUTES, when merged with the default face for display, can be represented in a way that's - \(1) different in appearance than the default face, and - \(2) `close in spirit' to what the attributes specify, if not exact. + (1) different in appearance than the default face, and + (2) `close in spirit' to what the attributes specify, if not exact. Point (2) implies that a `:weight black' attribute will be satisfied by any display that can display bold, and a `:foreground \"yellow\"' as long @@ -6521,7 +6521,7 @@ changing this variable for it to take effect. */); Each element is a cons (FONT-PATTERN . RESCALE-RATIO), where FONT-PATTERN is a font-spec or a regular expression matching a font name, and RESCALE-RATIO is a floating point number to specify how much larger -\(or smaller) font we should use. For instance, if a face requests +(or smaller) font we should use. For instance, if a face requests a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point. */); Vface_font_rescale_alist = Qnil; diff --git a/src/xfns.c b/src/xfns.c index 42d32f6..d6a3d76 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3444,8 +3444,8 @@ x_focus_frame (struct frame *f) DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, - doc: /* Internal function called by `color-defined-p', which see -.\(Note that the Nextstep version of this function ignores FRAME.) */) + doc: /* Internal function called by `color-defined-p', which see. +(Note that the Nextstep version of this function ignores FRAME.) */) (Lisp_Object color, Lisp_Object frame) { XColor foo; @@ -3612,7 +3612,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, doc: /* Return the "vendor ID" string of the GUI software on TERMINAL. -\(Labeling every distributor as a "vendor" embodies the false assumption +(Labeling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) The optional argument TERMINAL specifies which display to ask about. @@ -4710,7 +4710,7 @@ DISPLAY is the name of the display to connect to. Optional second arg XRM-STRING is a string of resources in xrdb format. If the optional third arg MUST-SUCCEED is non-nil, terminate Emacs if we can't open the connection. -\(In the Nextstep version, the last two arguments are currently ignored.) */) +(In the Nextstep version, the last two arguments are currently ignored.) */) (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed) { char *xrm_option; diff --git a/src/xselect.c b/src/xselect.c index e7e3fe7..9aaa10c 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1915,7 +1915,7 @@ DEFUN ("x-own-selection-internal", Fx_own_selection_internal, Sx_own_selection_internal, 2, 3, 0, doc: /* Assert an X selection of type SELECTION and value VALUE. SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names, since that's what X expects.) +(Those are literal upper-case symbol names, since that's what X expects.) VALUE is typically a string, or a cons of two markers, but may be anything that the functions on `selection-converter-alist' know about. @@ -1944,7 +1944,7 @@ DEFUN ("x-get-selection-internal", Fx_get_selection_internal, Sx_get_selection_internal, 2, 4, 0, doc: /* Return text selected from some X window. SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names, since that's what X expects.) +(Those are literal upper-case symbol names, since that's what X expects.) TARGET-TYPE is the type of data desired, typically `STRING'. TIME-STAMP is the time to use in the XConvertSelection call for foreign @@ -2048,7 +2048,7 @@ DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p, doc: /* Whether the current Emacs process owns the given X Selection. The arg should be the name of the selection in question, typically one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names, since that's what X expects.) +(Those are literal upper-case symbol names, since that's what X expects.) For convenience, the symbol nil is the same as `PRIMARY', and t is the same as `SECONDARY'. @@ -2623,7 +2623,7 @@ and the local selection value (whatever was given to `x-own-selection-internal'). The function should return the value to send to the X server -\(typically a string). A return value of nil +(typically a string). A return value of nil means that the conversion could not be done. A return value which is the symbol `NULL' means that a side-effect was executed, @@ -2632,10 +2632,10 @@ and there is no meaningful selection value. */); DEFVAR_LISP ("x-lost-selection-functions", Vx_lost_selection_functions, doc: /* A list of functions to be called when Emacs loses an X selection. -\(This happens when some other X client makes its own selection +(This happens when some other X client makes its own selection or when a Lisp program explicitly clears the selection.) The functions are called with one argument, the selection type -\(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'). */); +(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'). */); Vx_lost_selection_functions = Qnil; DEFVAR_LISP ("x-sent-selection-functions", Vx_sent_selection_functions, commit 309d39b832ccd72f99cc726090ff03f7e146948d Author: Paul Eggert Date: Wed Sep 16 16:09:09 2015 -0700 A few more minor quoting fixes in a script and a text file diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 8bcb2d6..15d4d37 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -103,7 +103,7 @@ BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) \ # Files to compile before others during a bootstrap. This is done to # speed up the bootstrap process. They're ordered by size, so we use # the slowest-compiler on the smallest file and move to larger files as the -# compiler gets faster. `autoload.elc' comes last because it is not used by +# compiler gets faster. 'autoload.elc' comes last because it is not used by # the compiler (so its compilation does not speed up subsequent compilations), # it's only placed here so as to speed up generation of the loaddefs.el file. @@ -272,22 +272,22 @@ $(THEFILE)c: compile-first: $(COMPILE_FIRST) -# In `compile-main' we could directly do +# In 'compile-main' we could directly do # ... | xargs $(MAKE) # and it works, but it generates a lot of messages like # make[2]: gnus/gnus-mlspl.elc is up to date. # so instead, we use "xargs echo" to split the list of file into manageable -# chunks and then use an intermediate `compile-targets' target so the +# chunks and then use an intermediate 'compile-targets' target so the # actual targets (the .elc files) are not mentioned as targets on the # make command line. .PHONY: compile-targets -# TARGETS is set dynamically in the recursive call from `compile-main'. +# TARGETS is set dynamically in the recursive call from 'compile-main'. compile-targets: $(TARGETS) # Compile all the Elisp files that need it. Beware: it approximates -# `no-byte-compile', so watch out for false-positives! +# 'no-byte-compile', so watch out for false-positives! compile-main: leim semantic compile-clean @(cd $(lisp) && \ els=`echo "${SUBDIRS_REL} " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \ @@ -326,7 +326,7 @@ semantic: compile: $(LOADDEFS) autoloads compile-first $(MAKE) compile-main -# Compile all Lisp files. This is like `compile' but compiles files +# Compile all Lisp files. This is like 'compile' but compiles files # unconditionally. Some files don't actually get compiled because they # set the local variable no-byte-compile. compile-always: diff --git a/lisp/README b/lisp/README index e250a70..b68ad5e 100644 --- a/lisp/README +++ b/lisp/README @@ -6,8 +6,7 @@ files are architecture-independent. The term subdirectory contains Lisp files that customize Emacs for certain terminal types. When Emacs starts, it checks the TERM environment variable to get the terminal type and loads -`term/${TERM}.el' if it exists. +'term/${TERM}.el' if it exists. The other subdirectories hold Lisp packages grouped by their general purpose. - commit e56096dbb9560b558f74d2b21e21659e221b914c Author: Paul Eggert Date: Wed Sep 16 16:06:29 2015 -0700 Minor quoting fixes in scripts and doc Prefer straight quotes in random script files, as they are not converted. Prefer grave quotes in a couple of places in the manual that were missed earlier, as these quotes are converted. diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk index 59c6388..24152b4 100644 --- a/admin/charsets/eucjp-ms.awk +++ b/admin/charsets/eucjp-ms.awk @@ -24,7 +24,7 @@ # http://home.m05.itscom.net/numa/cde/ucs-conv/appendix.html # This program reads the mapping file EUC-JP-MS (of glibc) and # generates the Elisp file eucjp-ms.el that defines two translation -# tables `eucjp-ms-decode' and `eucjp-ms-encode'. +# tables 'eucjp-ms-decode' and 'eucjp-ms-encode'. BEGIN { FS = "[ \t][ \t]*" @@ -109,4 +109,3 @@ END { print ""; print "(provide 'eucjp-ms)"; } - diff --git a/admin/coccinelle/vector_contents.cocci b/admin/coccinelle/vector_contents.cocci index 3c696ff..10b01f2 100644 --- a/admin/coccinelle/vector_contents.cocci +++ b/admin/coccinelle/vector_contents.cocci @@ -1,4 +1,4 @@ -// Avoid direct access to `contents' member of +// Avoid direct access to 'contents' member of // Lisp_Vector, use AREF and ASET where possible. @expression@ identifier I1, I2; diff --git a/admin/make-emacs b/admin/make-emacs index f0c5370..24e9844 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -100,7 +100,7 @@ chdir $root if cwd () eq "/"; chdir "./src"; print "Build in ", cwd (), "\n"; -# If first arg is `all' or if `--all' specified, ensure a clean +# If first arg is 'all' or if '--all' specified, ensure a clean # build. if (@ARGV && $ARGV[0] eq "all") diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index a913579..27bb77d 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -390,7 +390,7 @@ Searching and Replacement * Symbol Search:: Search for a source code symbol. * Regexp Search:: Search for match for a regexp. * Regexps:: Syntax of regular expressions. -* Regexp Backslash:: Regular expression constructs starting with '\'. +* Regexp Backslash:: Regular expression constructs starting with `\'. * Regexp Example:: A complex regular expression explained. * Search Case:: To ignore case while searching, or not. * Replace:: Search, and replace some or all matches. diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 9b91421..ae275d1 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -24,7 +24,7 @@ thing, but search for patterns instead of fixed strings. * Symbol Search:: Search for a source code symbol. * Regexp Search:: Search for match for a regexp. * Regexps:: Syntax of regular expressions. -* Regexp Backslash:: Regular expression constructs starting with '\'. +* Regexp Backslash:: Regular expression constructs starting with `\'. * Regexp Example:: A complex regular expression explained. * Search Case:: To ignore case while searching, or not. * Replace:: Search, and replace some or all matches. diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index 5d6cbd4..cdcb666 100644 --- a/etc/emacs-buffer.gdb +++ b/etc/emacs-buffer.gdb @@ -29,8 +29,8 @@ # The Emacs executable must have debugging symbols for this to work. # But you never strip Emacs, right? # -# The main commands of interest are `ybuffer-list', `yfile-buffers', -# `ysave-buffer', and `ybuffer-contents'. The `y' prefix avoids any +# The main commands of interest are 'ybuffer-list', 'yfile-buffers', +# 'ysave-buffer', and 'ybuffer-contents'. The 'y' prefix avoids any # namespace collisions with emacs/src/.gdbinit. # Since the internal data structures in Emacs occasionally from time to @@ -129,7 +129,7 @@ end document ybuffer-list Display a list of buffer names, sizes, and other attributes. The buffer number in the first column is used as an argument - to some other emacs-buffer recovery commands, e.g. `ysave-buffer'. + to some other emacs-buffer recovery commands, e.g. 'ysave-buffer'. end define yfile-buffers @@ -138,7 +138,7 @@ define yfile-buffers end document yfile-buffers Display a list of buffers which are associated with files. - This is like `ybuffer-list', but only buffers that were visiting files + This is like 'ybuffer-list', but only buffers that were visiting files are displayed. end @@ -165,7 +165,7 @@ define yset-buffer end document yset-buffer Set current buffer (for other emacs-buffer recovery commands) to the ARG'th - buffer as displayed by `ybuffer-list'. + buffer as displayed by 'ybuffer-list'. end define yget-buffer-pointers @@ -184,9 +184,9 @@ define yget-buffer-pointers end document yget-buffer-pointers Update convenience variables with address pointers for the ARG'th buffer - as displayed by `ybuffer-list'. + as displayed by 'ybuffer-list'. - This also sets the current buffer using `yset-buffer' (which see). + This also sets the current buffer using 'yset-buffer' (which see). end define yget-current-buffer-name @@ -220,11 +220,11 @@ define ydump-buffer end end document ydump-buffer - Write contents of buffer N (as numbered according to `ybuffer-list') to + Write contents of buffer N (as numbered according to 'ybuffer-list') to file FILE. - This is mainly used as an internal subroutine for `ysave-buffer' and - `ybuffer-contents', which see. + This is mainly used as an internal subroutine for 'ysave-buffer' and + 'ybuffer-contents', which see. end define ysave-buffer @@ -242,7 +242,7 @@ define ysave-buffer end end document ysave-buffer - Save contents of buffer N (as numbered according to `ybuffer-list') to + Save contents of buffer N (as numbered according to 'ybuffer-list') to file FILE. end @@ -258,7 +258,7 @@ define ybuffer-contents end end document ybuffer-contents - Write contents of buffer N (numbered according to `ybuffer-list') to stdout. + Write contents of buffer N (numbered according to 'ybuffer-list') to stdout. end # local variables: diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index a175967..2b65cb2 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -24,7 +24,7 @@ SHELL = @SHELL@ EMACS = ../src/emacs${EXEEXT} EMACSOPT = -batch --no-site-file --no-site-lisp -# ==================== Things `configure' will edit ==================== +# ==================== Things 'configure' will edit ==================== CC=@CC@ CFLAGS=@CFLAGS@ @@ -83,31 +83,31 @@ ns_appbindir=@ns_appbindir@ # subdirectories of this directory. The default values for many of # the variables below are expressed in terms of this one, so you may # not need to change them. This is set with the --prefix option to -# `../configure'. +# '../configure'. prefix=@prefix@ -# Like `prefix', but used for architecture-specific files. This is -# set with the --exec-prefix option to `../configure'. +# Like 'prefix', but used for architecture-specific files. This is +# set with the --exec-prefix option to '../configure'. exec_prefix=@exec_prefix@ # Where to install Emacs and other binaries that people will want to # run directly (like etags). This is set with the --bindir option -# to `../configure'. +# to '../configure'. bindir=@bindir@ # Where to install and expect executable files to be run by Emacs # rather than directly by users, and other architecture-dependent # data. ${archlibdir} is usually below this. This is set with the -# --libexecdir option to `../configure'. +# --libexecdir option to '../configure'. libexecdir=@libexecdir@ # Directory for local state files for all programs. localstatedir=@localstatedir@ # Where to find the source code. This is set by the configure -# script's `--srcdir' option. However, the value of ${srcdir} in +# script's '--srcdir' option. However, the value of ${srcdir} in # this makefile is not identical to what was specified with --srcdir, -# since the variable here has `/lib-src' added at the end. +# since the variable here has '/lib-src' added at the end. # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. srcdir=@srcdir@ @@ -127,7 +127,7 @@ abs_top_srcdir=@abs_top_srcdir@ # This path usually includes the Emacs version and configuration name, # so that multiple configurations for multiple versions of Emacs may # be installed at once. This can be set with the --archlibdir option -# to `../configure'. +# to '../configure'. archlibdir=@archlibdir@ gamedir=@gamedir@ diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in index 59a8866..41f54f8 100644 --- a/test/automated/Makefile.in +++ b/test/automated/Makefile.in @@ -86,7 +86,7 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@ ## -l ./basename treats basename as a literal file (it would be nice ## to change this; bug#17848 - if that gets done, this can be simplified). ## -## Beware: it approximates `no-byte-compile', so watch out for false-positives! +## Beware: it approximates 'no-byte-compile', so watch out for false-positives! %.log: ${srcdir}/%.el @if grep '^;.*no-byte-compile: t' $< > /dev/null; then \ loadfile=$<; \ commit dc436dd77f70dbc2e294a1fd2d69a332f1413fa5 Author: Paul Eggert Date: Wed Sep 16 15:52:09 2015 -0700 Minor backslash fixes in manuals and scripts * Makefile.in (install-arch-indep): * admin/charsets/compact.awk: * admin/charsets/gb180302.awk (gb_to_index): * admin/charsets/gb180304.awk (gb_to_index): Avoid undefined behavior in Awk regular expression backslashes. * doc/misc/efaq.texi (Matching parentheses): Omit unnecessary backslashes. * doc/misc/gnus-faq.texi (FAQ 5-8): Avoid undefined behavior in suggested sed backslash usage. diff --git a/Makefile.in b/Makefile.in index 3cfbe57..4ee84f9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -593,8 +593,8 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} rm -f $${subdir}/.gitignore ; \ rm -f $${subdir}/.arch-inventory ; \ rm -f $${subdir}/.DS_Store ; \ - rm -f $${subdir}/\#* ; \ - rm -f $${subdir}/.\#* ; \ + rm -f $${subdir}/#* ; \ + rm -f $${subdir}/.#* ; \ rm -f $${subdir}/*~ ; \ rm -f $${subdir}/*.orig ; \ rm -f $${subdir}/ChangeLog* ; \ diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk index b7d1fd1..21e03ee 100644 --- a/admin/charsets/compact.awk +++ b/admin/charsets/compact.awk @@ -69,7 +69,7 @@ function decode_hex(str, idx) { return n; } -/^\#/ { +/^#/ { print; next; } @@ -119,4 +119,3 @@ END { printf "0x%04X-0x%04X 0x%04X\n", from_code, to_code, from_unicode; } } - diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk index 40d92bf..4947f96 100644 --- a/admin/charsets/gb180302.awk +++ b/admin/charsets/gb180302.awk @@ -53,7 +53,7 @@ function decode_hex(str) { function gb_to_index(gb) { b0 = int(gb / 256); b1 = gb % 256; - idx = (((b0 - 129)) * 191 + b1 - 64); + idx = (((b0 - 129)) * 191 + b1 - 64); # if (b1 >= 128) # idx--; return idx @@ -67,7 +67,7 @@ function index_to_gb(idx) { return (b0 * 256 + b1); } -/^\#/ { +/^#/ { print; next; } @@ -108,4 +108,3 @@ END { printf "0x%04X-0x%04X 0x%04X\n", index_to_gb(from_gb), index_to_gb(to_gb), from_unicode; } - diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk index 3c16cb5..81d7e73 100644 --- a/admin/charsets/gb180304.awk +++ b/admin/charsets/gb180304.awk @@ -49,7 +49,7 @@ function decode_hex(str) { function gb_to_index(gb) { b0 = int(gb / 256); b1 = gb % 256; - idx = (((b0 - 129)) * 191 + b1 - 64); + idx = (((b0 - 129)) * 191 + b1 - 64); # if (b1 >= 127) # idx--; return idx @@ -65,7 +65,7 @@ function index_to_gb(idx) { return sprintf("%02X%02X%02X%02X", b0, b1, b2, b3); } -/^\#/ { +/^#/ { print; next; } @@ -119,4 +119,3 @@ END { } } } - diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 3e9109d..6557f4d 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -2089,8 +2089,8 @@ parenthesis, it simply inserts a % like normal. (defun match-paren (arg) "Go to the matching paren if on a paren; otherwise insert %." (interactive "p") - (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1)) - ((looking-at "\\s\)") (forward-char 1) (backward-list 1)) + (cond ((looking-at "\\s(") (forward-list 1) (backward-char 1)) + ((looking-at "\\s)") (forward-char 1) (backward-list 1)) (t (self-insert-command (or arg 1))))) @end lisp diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 19c78bf..26b9210 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -1528,7 +1528,7 @@ and create the actual X-face by saying @example cat file.xbm | xbm2ikon | compface > file.face -cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted +cat file.face | sed 's/["\\]/\\&/g' > file.face.quoted @end example @noindent commit 8865587c55f251ac624e6730505de66d15b28562 Author: Paul Eggert Date: Wed Sep 16 14:40:53 2015 -0700 Add -Wswitch to --enable-gcc-warnings Make --enable-gcc-warnings a bit pickier, by also using -Wswitch. * configure.ac (WERROR_CFLAGS): Don’t add -Wno-switch. * lib-src/etags.c (main, consider_token, C_entries): * src/coding.c (encode_invocation_designation): * src/data.c (Ftype_of): * src/eval.c (Fdefvaralias, default_toplevel_binding) (Fbacktrace__locals, mark_specpdl): * src/lisp.h (record_xmalloc): * src/syntax.c (scan_lists, scan_sexps_forward): * src/window.c (window_relative_x_coord): * src/xdisp.c (push_it, pop_it): * src/xterm.c (xg_scroll_callback, x_check_fullscreen): Error out or do nothing (as appropriate) if a switch statement with an enum value does not cover all of the enum. * src/dispextern.h (struct iterator_stack_entry.u.comp): Remove unused member discovered by using -Wswitch. * src/lisp.h (record_xmalloc): Add a ‘+ 0’ to pacify -Wswitch. * src/vm-limit.c (check_memory_limits): Simplify warning-diagnostic computation by using a table. diff --git a/configure.ac b/configure.ac index f86d29e..d537f73 100644 --- a/configure.ac +++ b/configure.ac @@ -929,9 +929,12 @@ else nw="$nw -Wsuggest-attribute=pure" # This part is merely for shortening the command line, + # since -Wall implies -Wswitch. + nw="$nw -Wswitch" + + # This part is merely for shortening the command line, # since -Wno-FOO needs to be added below regardless. nw="$nw -Wmissing-field-initializers" - nw="$nw -Wswitch" nw="$nw -Wtype-limits" nw="$nw -Wunused-parameter" @@ -948,7 +951,6 @@ else gl_WARN_ADD([-Wno-missing-field-initializers]) # We need this one gl_WARN_ADD([-Wno-sign-compare]) # Too many warnings for now gl_WARN_ADD([-Wno-type-limits]) # Too many warnings for now - gl_WARN_ADD([-Wno-switch]) # Too many warnings for now gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now gl_WARN_ADD([-Wno-format-nonliteral]) diff --git a/lib-src/etags.c b/lib-src/etags.c index 7baff8c..791722d 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -1268,6 +1268,8 @@ main (int argc, char **argv) this_file = argbuffer[i].what; process_file (stdin, this_file, lang); break; + default: + error ("internal error: arg_type"); } } @@ -2754,6 +2756,9 @@ consider_token (char *str, int len, int c, int *c_extp, case st_C_struct: case st_C_enum: typdef = ttypeseen; + break; + default: + break; } break; case ttypeseen: @@ -2770,8 +2775,11 @@ consider_token (char *str, int len, int c, int *c_extp, case st_C_struct: case st_C_enum: return false; + default: + return true; } - return true; + default: + break; } switch (toktype) @@ -2804,6 +2812,8 @@ consider_token (char *str, int len, int c, int *c_extp, fvdef = fvnone; } return false; + default: + break; } if (structdef == skeyseen) @@ -2827,6 +2837,8 @@ consider_token (char *str, int len, int c, int *c_extp, case st_C_objimpl: objdef = oimplementation; return false; + default: + break; } break; case oimplementation: @@ -2888,6 +2900,8 @@ consider_token (char *str, int len, int c, int *c_extp, objdef = onone; } return false; + default: + break; } /* A function, variable or enum constant? */ @@ -2943,6 +2957,8 @@ consider_token (char *str, int len, int c, int *c_extp, return false; } break; + default: + break; } /* FALLTHRU */ case fvnameseen: @@ -2959,8 +2975,12 @@ consider_token (char *str, int len, int c, int *c_extp, fvdef = fvnameseen; /* function or variable */ *is_func_or_var = true; return true; + default: + break; } break; + default: + break; } return false; @@ -3470,6 +3490,8 @@ C_entries (int c_ext, FILE *inf) fvdef = fignore; } break; + default: + break; } if (structdef == stagseen && !cjava) { @@ -3480,6 +3502,8 @@ C_entries (int c_ext, FILE *inf) case dsharpseen: savetoken = token; break; + default: + break; } if (!yacc_rules || lp == newlb.buffer + 1) { @@ -3508,7 +3532,7 @@ C_entries (int c_ext, FILE *inf) break; switch (objdef) { - case otagseen: + case otagseen: objdef = oignore; make_C_tag (true); /* an Objective C class */ break; @@ -3522,6 +3546,8 @@ C_entries (int c_ext, FILE *inf) strcpy (token_name.buffer + toklen, ":"); } break; + default: + break; } if (structdef == stagseen) { @@ -3599,6 +3625,8 @@ C_entries (int c_ext, FILE *inf) make_C_tag (true); /* an Objective C method */ objdef = oinbody; break; + default: + break; } switch (fvdef) { @@ -3672,6 +3700,8 @@ C_entries (int c_ext, FILE *inf) fvdef = fvnone; } break; + default: + break; } break; case '(': @@ -3705,6 +3735,8 @@ C_entries (int c_ext, FILE *inf) case flistseen: fvdef = finlist; break; + default: + break; } parlev++; break; @@ -3730,6 +3762,8 @@ C_entries (int c_ext, FILE *inf) case finlist: fvdef = flistseen; break; + default: + break; } if (!instruct && (typdef == tend @@ -3801,6 +3835,8 @@ C_entries (int c_ext, FILE *inf) bracelev = -1; } break; + default: + break; } switch (structdef) { @@ -3814,6 +3850,8 @@ C_entries (int c_ext, FILE *inf) structdef = snone; make_C_tag (false); /* a struct or enum */ break; + default: + break; } bracelev += 1; break; diff --git a/src/coding.c b/src/coding.c index 1544f31..d14e562 100644 --- a/src/coding.c +++ b/src/coding.c @@ -4295,6 +4295,9 @@ encode_invocation_designation (struct charset *charset, else ENCODE_LOCKING_SHIFT_3; break; + + default: + break; } } @@ -7292,6 +7295,8 @@ produce_annotation (struct coding_system *coding, ptrdiff_t pos) case CODING_ANNOTATE_CHARSET_MASK: produce_charset (coding, charbuf, pos); break; + default: + break; } charbuf += len; } diff --git a/src/data.c b/src/data.c index 88c5a30..34265b7 100644 --- a/src/data.c +++ b/src/data.c @@ -226,8 +226,9 @@ for example, (type-of 1) returns `integer'. */) return Qfloat; case Lisp_Misc_Finalizer: return Qfinalizer; + default: + emacs_abort (); } - emacs_abort (); case Lisp_Vectorlike: if (WINDOW_CONFIGURATIONP (object)) diff --git a/src/dispextern.h b/src/dispextern.h index e5adeab..e44b70b 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2378,10 +2378,6 @@ struct it struct it_slice slice; ptrdiff_t image_id; } image; - /* method == GET_FROM_COMPOSITION */ - struct { - Lisp_Object object; - } comp; /* method == GET_FROM_STRETCH */ struct { Lisp_Object object; diff --git a/src/eval.c b/src/eval.c index 77d435a..b42f904 100644 --- a/src/eval.c +++ b/src/eval.c @@ -596,6 +596,11 @@ The return value is BASE-VARIABLE. */) error ("Cannot make an internal variable an alias"); case SYMBOL_LOCALIZED: error ("Don't know how to make a localized variable an alias"); + case SYMBOL_PLAINVAL: + case SYMBOL_VARALIAS: + break; + default: + emacs_abort (); } /* http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg00834.html @@ -640,6 +645,17 @@ default_toplevel_binding (Lisp_Object symbol) if (EQ (specpdl_symbol (pdl), symbol)) binding = pdl; break; + + case SPECPDL_UNWIND: + case SPECPDL_UNWIND_PTR: + case SPECPDL_UNWIND_INT: + case SPECPDL_UNWIND_VOID: + case SPECPDL_BACKTRACE: + case SPECPDL_LET_LOCAL: + break; + + default: + emacs_abort (); } } return binding; @@ -3462,6 +3478,17 @@ NFRAMES and BASE specify the activation frame to use, as in `backtrace-frame'. else result = Fcons (Fcons (sym, val), result); } + break; + + case SPECPDL_UNWIND: + case SPECPDL_UNWIND_PTR: + case SPECPDL_UNWIND_INT: + case SPECPDL_UNWIND_VOID: + case SPECPDL_BACKTRACE: + break; + + default: + emacs_abort (); } } } @@ -3504,6 +3531,14 @@ mark_specpdl (void) mark_object (specpdl_symbol (pdl)); mark_object (specpdl_old_value (pdl)); break; + + case SPECPDL_UNWIND_PTR: + case SPECPDL_UNWIND_INT: + case SPECPDL_UNWIND_VOID: + break; + + default: + emacs_abort (); } } } diff --git a/src/lisp.h b/src/lisp.h index acbd679..15fe40d 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4353,12 +4353,13 @@ INLINE ptrdiff_t lisp_word_count (ptrdiff_t nbytes) { if (-1 >> 1 == -1) - switch (word_size) + switch (word_size + 0) { case 2: return nbytes >> 1; case 4: return nbytes >> 2; case 8: return nbytes >> 3; case 16: return nbytes >> 4; + default: break; } return nbytes / word_size - (nbytes % word_size < 0); } diff --git a/src/syntax.c b/src/syntax.c index de45c50..55a4ba0 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -2799,12 +2799,8 @@ scan_lists (EMACS_INT from, EMACS_INT count, EMACS_INT depth, bool sexpflag) : c_code == Sstring_fence) break; - switch (c_code) - { - case Scharquote: - case Sescape: - INC_BOTH (from, from_byte); - } + if (c_code == Scharquote || c_code == Sescape) + INC_BOTH (from, from_byte); INC_BOTH (from, from_byte); } INC_BOTH (from, from_byte); @@ -3419,11 +3415,16 @@ do { prev_from = from; \ case Sstring_fence: if (!nofence) goto string_end; break; + case Scharquote: case Sescape: INC_FROM; startquotedinstring: if (from >= end) goto endquoted; + break; + + default: + break; } INC_FROM; } diff --git a/src/vm-limit.c b/src/vm-limit.c index ab102e3..503aaae 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -170,19 +170,13 @@ check_memory_limits (void) if (new_warnlevel > warnlevel || new_warnlevel == warned_95) { warnlevel = new_warnlevel; - switch (warnlevel) + static char const *const warn_diagnostic[] = { - case warned_75: - (*warn_function) ("Warning: past 75% of memory limit"); - break; - - case warned_85: - (*warn_function) ("Warning: past 85% of memory limit"); - break; - - case warned_95: - (*warn_function) ("Warning: past 95% of memory limit"); - } + "Warning: past 75% of memory limit", + "Warning: past 85% of memory limit", + "Warning: past 95% of memory limit" + }; + warn_function (warn_diagnostic[warnlevel - 1]); } /* Handle going down in usage levels, with some hysteresis. */ else diff --git a/src/window.c b/src/window.c index f6fe0cd..f1af68e 100644 --- a/src/window.c +++ b/src/window.c @@ -1291,10 +1291,18 @@ window_relative_x_coord (struct window *w, enum window_part part, int x) + window_box_width (w, RIGHT_MARGIN_AREA) + ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)) ? WINDOW_RIGHT_FRINGE_WIDTH (w) : 0)); - } - /* ON_SCROLL_BAR, ON_NOTHING, and ON_VERTICAL_BORDER: */ - return 0; + case ON_NOTHING: + case ON_VERTICAL_BORDER: + case ON_VERTICAL_SCROLL_BAR: + case ON_HORIZONTAL_SCROLL_BAR: + case ON_RIGHT_DIVIDER: + case ON_BOTTOM_DIVIDER: + return 0; + + default: + emacs_abort (); + } } diff --git a/src/xdisp.c b/src/xdisp.c index b863077..a3224e2 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -5895,6 +5895,13 @@ push_it (struct it *it, struct text_pos *position) case GET_FROM_STRETCH: p->u.stretch.object = it->object; break; + case GET_FROM_BUFFER: + case GET_FROM_DISPLAY_VECTOR: + case GET_FROM_STRING: + case GET_FROM_C_STRING: + break; + default: + emacs_abort (); } p->position = position ? *position : it->position; p->current = it->current; @@ -6017,6 +6024,11 @@ pop_it (struct it *it) it->method = GET_FROM_BUFFER; it->object = it->w->contents; } + break; + case GET_FROM_C_STRING: + break; + default: + emacs_abort (); } it->end_charpos = p->end_charpos; it->string_nchars = p->string_nchars; diff --git a/src/xterm.c b/src/xterm.c index 9ee76e9..13e1902 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -5407,6 +5407,8 @@ xg_scroll_callback (GtkRange *range, ? scroll_bar_after_handle : scroll_bar_below_handle); bar->dragging = -1; break; + default: + break; } if (part != scroll_bar_nowhere) @@ -10193,6 +10195,9 @@ x_check_fullscreen (struct frame *f) case FULLSCREEN_HEIGHT: lval = Qfullheight; height = x_display_pixel_height (dpyinfo); + break; + default: + emacs_abort (); } frame_size_history_add commit 82198ed57e3059f0526658608fd22b5fc87ab734 Author: Paul Eggert Date: Wed Sep 16 14:39:29 2015 -0700 etags ‘fatal’ function is now printf-like * lib-src/etags.c (fatal): Now printf-like. All callers changed. Also, now static; not clear why it needed to be extern. (verror): New function, with most of the old contents of ‘error’. (fatal, error): Use it. diff --git a/lib-src/etags.c b/lib-src/etags.c index f34c985..7baff8c 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -361,8 +361,9 @@ static void analyze_regex (char *); static void free_regexps (void); static void regex_tag_multiline (void); static void error (const char *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2); +static void verror (char const *, va_list) ATTRIBUTE_FORMAT_PRINTF (1, 0); static _Noreturn void suggest_asking_for_help (void); -_Noreturn void fatal (const char *, const char *); +static _Noreturn void fatal (char const *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2); static _Noreturn void pfatal (const char *); static void add_node (node *, node **); @@ -1091,7 +1092,7 @@ main (int argc, char **argv) ++current_arg; ++file_count; if (parsing_stdin) - fatal ("cannot parse standard input more than once", (char *)NULL); + fatal ("cannot parse standard input more than once"); parsing_stdin = true; break; @@ -1255,8 +1256,8 @@ main (int argc, char **argv) if (streq (this_file, "-")) { if (parsing_stdin) - fatal ("cannot parse standard input AND read file names from it", - (char *)NULL); + fatal ("cannot parse standard input " + "AND read file names from it"); while (readline_internal (&filename_lb, stdin, "-") > 0) process_file_name (filename_lb.buffer, lang); } @@ -1324,7 +1325,7 @@ main (int argc, char **argv) z = stpcpy (z, tagfile); strcpy (z, ";rm OTAGS"); if (system (cmd) != EXIT_SUCCESS) - fatal ("failed to execute shell command", (char *)NULL); + fatal ("failed to execute shell command"); } free (cmd); append_to_tagfile = true; @@ -6351,10 +6352,13 @@ skip_name (char *cp) } /* Print error message and exit. */ -void -fatal (const char *s1, const char *s2) +static void +fatal (char const *format, ...) { - error (s1, s2); + va_list ap; + va_start (ap, format); + verror (format, ap); + va_end (ap); exit (EXIT_FAILURE); } @@ -6379,10 +6383,16 @@ error (const char *format, ...) { va_list ap; va_start (ap, format); + verror (format, ap); + va_end (ap); +} + +static void +verror (char const *format, va_list ap) +{ fprintf (stderr, "%s: ", progname); vfprintf (stderr, format, ap); fprintf (stderr, "\n"); - va_end (ap); } /* Return a newly-allocated string whose contents @@ -6673,7 +6683,7 @@ xmalloc (size_t size) { void *result = malloc (size); if (result == NULL) - fatal ("virtual memory exhausted", (char *)NULL); + fatal ("virtual memory exhausted"); return result; } @@ -6682,7 +6692,7 @@ xrealloc (void *ptr, size_t size) { void *result = realloc (ptr, size); if (result == NULL) - fatal ("virtual memory exhausted", (char *)NULL); + fatal ("virtual memory exhausted"); return result; } commit 641350b2fd23e47e7f9c3cc02dda04576fa10df7 Author: Eli Zaretskii Date: Wed Sep 16 21:38:16 2015 +0300 More adaptations in file-notify-tests.el * test/automated/file-notify-tests.el (file-notify-test05-dir-validity): Skip for w32notify in batch-mode. (Bug#21432) diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el index 848225d..dfc3244 100644 --- a/test/automated/file-notify-tests.el +++ b/test/automated/file-notify-tests.el @@ -411,6 +411,9 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered." (ert-deftest file-notify-test05-dir-validity () "Check `file-notify-valid-p' for directories." (skip-unless (file-notify--test-local-enabled)) + ;; The batch-mode operation of w32notify is fragile (there's no + ;; input threads to send the message to). + (skip-unless (not (and noninteractive (eq file-notify--library 'w32notify)))) (unwind-protect (progn (setq file-notify--test-tmpfile (file-name-as-directory commit 4969489ce0da37b8f6e589a2c8c95a191ef88091 Author: Michael Albinus Date: Wed Sep 16 20:26:31 2015 +0200 Adapt test in file-notify-tests.el * test/automated/file-notify-tests.el (file-notify-test04-file-validity): Skip for w32notify in batch-mode. Add test lost last commit. diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el index b962aa7..848225d 100644 --- a/test/automated/file-notify-tests.el +++ b/test/automated/file-notify-tests.el @@ -377,6 +377,9 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered." (ert-deftest file-notify-test04-file-validity () "Check `file-notify-valid-p' for files." (skip-unless (file-notify--test-local-enabled)) + ;; The batch-mode operation of w32notify is fragile (there's no + ;; input threads to send the message to). + (skip-unless (not (and noninteractive (eq file-notify--library 'w32notify)))) (unwind-protect (let ((temporary-file-directory (make-temp-file "file-notify-test-parent" t))) @@ -396,7 +399,8 @@ Don't wait longer than TIMEOUT seconds for the events to be delivered." ;; After deleting the parent, the descriptor must not be valid ;; anymore. (delete-directory temporary-file-directory t) - (read-event nil nil 0.5)) + (read-event nil nil 0.5) + (should-not (file-notify-valid-p file-notify--test-desc))) ;; Exit. (file-notify--test-cleanup))) commit d605a539d4863c7e7c66aaea6e538ae14c47f3d7 Author: Dima Kogan Date: Tue Sep 15 11:53:54 2015 -0700 winner no longer holds on to dead frames * lisp/winner.el (winner-change-fun): Cull dead frames. This prevents a potentially massive memory leak. See: http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00619.html diff --git a/lisp/winner.el b/lisp/winner.el index fdf6213..a05f4ba 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -177,6 +177,11 @@ You may want to include buffer names such as *Help*, *Apropos*, ;; Called whenever the window configuration changes ;; (a `window-configuration-change-hook'). (defun winner-change-fun () + + ;; Cull dead frames. + (setq winner-modified-list + (cl-remove-if-not 'frame-live-p winner-modified-list)) + (unless (or (memq (selected-frame) winner-modified-list) (/= 0 (minibuffer-depth))) (push (selected-frame) winner-modified-list))) commit b0f4acfcb739358d98e3e4d78263467edb53e968 Merge: c762d33 23274ea Author: Michael Albinus Date: Wed Sep 16 15:51:01 2015 +0200 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs commit c762d3305cbd429606ef9f51f62b9bb3f36d00f2 Author: Michael Albinus Date: Wed Sep 16 15:50:37 2015 +0200 Use common report_file_notify_error function * src/fileio.c (report_file_notify_error): New function. * src/inotify.c (report_inotify_error): Remove function. (inotify_callback, symbol_to_inotifymask, Finotify_add_watch) (Finotify_rm_watch): Use report_file_notify_error. * src/lisp.h (report_file_notify_error): Declare external function. * src/w32notify.c (report_w32notify_error): Remove function. (Fw32notify_add_watch, Fw32notify_rm_watch): Use report_file_notify_error. diff --git a/src/fileio.c b/src/fileio.c index d4341f8..69933cc 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -210,6 +210,22 @@ report_file_error (char const *string, Lisp_Object name) report_file_errno (string, name, errno); } +/* Like report_file_error, but reports a file-notify-error instead. */ + +void +report_file_notify_error (const char *string, Lisp_Object name) +{ + Lisp_Object data = CONSP (name) || NILP (name) ? name : list1 (name); + synchronize_system_messages_locale (); + char *str = strerror (errno); + Lisp_Object errstring + = code_convert_string_norecord (build_unibyte_string (str), + Vlocale_coding_system, 0); + Lisp_Object errdata = Fcons (errstring, data); + + xsignal (Qfile_notify_error, Fcons (build_string (string), errdata)); +} + void close_file_unwind (int fd) { diff --git a/src/inotify.c b/src/inotify.c index 3eda877..be8c1dd 100644 --- a/src/inotify.c +++ b/src/inotify.c @@ -116,21 +116,6 @@ inotifyevent_to_event (Lisp_Object watch_object, struct inotify_event const *ev) XCDR (watch_object)); } -/* Like report_file_error, but reports a file-notify-error instead. */ -static _Noreturn void -report_inotify_error (const char *string, Lisp_Object name) -{ - Lisp_Object data = CONSP (name) || NILP (name) ? name : list1 (name); - synchronize_system_messages_locale (); - char *str = strerror (errno); - Lisp_Object errstring - = code_convert_string_norecord (build_unibyte_string (str), - Vlocale_coding_system, 0); - Lisp_Object errdata = Fcons (errstring, data); - - xsignal (Qfile_notify_error, Fcons (build_string (string), errdata)); -} - /* This callback is called when the FD is available for read. The inotify events are read from FD and converted into input_events. */ static void @@ -145,15 +130,14 @@ inotify_callback (int fd, void *_) to_read = 0; if (ioctl (fd, FIONREAD, &to_read) == -1) - report_inotify_error ("Error while trying to retrieve file system events", - Qnil); + report_file_notify_error ("Error while retrieving file system events", + Qnil); buffer = xmalloc (to_read); n = read (fd, buffer, to_read); if (n < 0) { xfree (buffer); - report_inotify_error ("Error while trying to read file system events", - Qnil); + report_file_notify_error ("Error while reading file system events", Qnil); } EVENT_INIT (event); @@ -231,7 +215,7 @@ symbol_to_inotifymask (Lisp_Object symb) else { errno = EINVAL; - report_inotify_error ("Unknown aspect", symb); + report_file_notify_error ("Unknown aspect", symb); } } @@ -324,7 +308,7 @@ is managed internally and there is no corresponding inotify_init. Use { inotifyfd = inotify_init1 (IN_NONBLOCK|IN_CLOEXEC); if (inotifyfd < 0) - report_inotify_error ("File watching (inotify) is not available", Qnil); + report_file_notify_error ("File watching is not available", Qnil); watch_list = Qnil; add_read_fd (inotifyfd, &inotify_callback, NULL); } @@ -333,7 +317,7 @@ is managed internally and there is no corresponding inotify_init. Use encoded_file_name = ENCODE_FILE (file_name); watchdesc = inotify_add_watch (inotifyfd, SSDATA (encoded_file_name), mask); if (watchdesc == -1) - report_inotify_error ("Could not add watch for file", file_name); + report_file_notify_error ("Could not add watch for file", file_name); watch_descriptor = make_watch_descriptor (watchdesc); @@ -362,7 +346,7 @@ See inotify_rm_watch(2) for more information. int wd = XINT (watch_descriptor); if (inotify_rm_watch (inotifyfd, wd) == -1) - report_inotify_error ("Could not rm watch", watch_descriptor); + report_file_notify_error ("Could not rm watch", watch_descriptor); /* Remove watch descriptor from watch list. */ watch_object = Fassoc (watch_descriptor, watch_list); diff --git a/src/lisp.h b/src/lisp.h index 71630ed..acbd679 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3840,6 +3840,7 @@ extern void fclose_unwind (void *); extern void restore_point_unwind (Lisp_Object); extern _Noreturn void report_file_errno (const char *, Lisp_Object, int); extern _Noreturn void report_file_error (const char *, Lisp_Object); +extern _Noreturn void report_file_notify_error (const char *, Lisp_Object); extern bool internal_delete_file (Lisp_Object); extern Lisp_Object emacs_readlinkat (int, const char *); extern bool file_directory_p (const char *); diff --git a/src/w32notify.c b/src/w32notify.c index a6b5c19..e822d95 100644 --- a/src/w32notify.c +++ b/src/w32notify.c @@ -464,21 +464,6 @@ filter_list_to_flags (Lisp_Object filter_list) return flags; } -/* Like report_file_error, but reports a file-notify-error instead. */ -static void -report_w32notify_error (const char *string, Lisp_Object name) -{ - Lisp_Object data = CONSP (name) || NILP (name) ? name : list1 (name); - synchronize_system_messages_locale (); - char *str = strerror (errno); - Lisp_Object errstring - = code_convert_string_norecord (build_unibyte_string (str), - Vlocale_coding_system, 0); - Lisp_Object errdata = Fcons (errstring, data); - - xsignal (Qfile_notify_error, Fcons (build_string (string), errdata)); -} - DEFUN ("w32notify-add-watch", Fw32notify_add_watch, Sw32notify_add_watch, 3, 3, 0, doc: /* Add a watch for filesystem events pertaining to FILE. @@ -543,8 +528,8 @@ generate notifications correctly, though. */) || (w32_major_version == 5 && w32_major_version < 1)) { errno = ENOSYS; - report_w32notify_error ("Watching filesystem events is not supported", - Qnil); + report_file_notify_error ("Watching filesystem events is not supported", + Qnil); } /* filenotify.el always passes us a directory, either the parent @@ -588,11 +573,11 @@ generate notifications correctly, though. */) Vlocale_coding_system, 0); else lisp_errstr = build_string (errstr); - report_w32notify_error ("Cannot watch file", - Fcons (lisp_errstr, Fcons (file, Qnil))); + report_file_notify_error ("Cannot watch file", + Fcons (lisp_errstr, Fcons (file, Qnil))); } else - report_w32notify_error ("Cannot watch file", Fcons (file, Qnil)); + report_file_notify_error ("Cannot watch file", Fcons (file, Qnil)); } /* Store watch object in watch list. */ watch_descriptor = make_pointer_integer (dirwatch); @@ -626,8 +611,8 @@ WATCH-DESCRIPTOR should be an object returned by `w32notify-add-watch'. */) } if (status == -1) - report_w32notify_error ("Invalid watch descriptor", Fcons (watch_descriptor, - Qnil)); + report_file_notify_error ("Invalid watch descriptor", + Fcons (watch_descriptor, Qnil)); return Qnil; } commit 23274eaf02f371bed49eba2eee9fde90ff3d6672 Author: Jay Belanger Date: Wed Sep 16 08:50:01 2015 -0500 Fix documentation. * doc/misc/calc.texi (Single-Variable Statistics): Fix the wording of the documentation of the root mean square. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 06e476d..ecf2ef9 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -20741,9 +20741,10 @@ $$ a_{i+1} = { a_i + b_i \over 2 } , \qquad b_{i+1} = \sqrt{a_i b_i} $$ @kindex u R @cindex Root-mean-square @tindex rms -Another commonly used mean, the RMS (root-mean-square), can be computed -for a vector of numbers by using the @kbd{u R} -(@code{calc-vector-rms}) [@code{rms}]command. +The @kbd{u R} (@code{calc-vector-rms}) [@code{rms}] +command computes the RMS (root-mean-square) of the data values. +As its name suggests, this is the square root of the mean of the +squares of the data values. @kindex u S @pindex calc-vector-sdev commit 1636e8c75a0d4576e6ac7a246bd7a484a79ecbc2 Author: Martin Rudalics Date: Wed Sep 16 12:01:06 2015 +0200 Remove tool_bar_redisplayed_once and associated code. * src/frame.h (tool_bar_redisplayed_once): Remove slot. * src/frame.c (make_frame, x_set_font): Remove initialization of f->tool_bar_redisplayed_once. * src/w32fns.c (x_change_tool_bar_height): * src/xfns.c (x_change_tool_bar_height): Don't check for f->tool_bar_redisplayed_once. * src/xdisp.c (redisplay_internal): Remove handling of f->tool_bar_redisplayed_once. diff --git a/src/frame.c b/src/frame.c index 6debcb8..b782b09 100644 --- a/src/frame.c +++ b/src/frame.c @@ -634,7 +634,6 @@ make_frame (bool mini_p) f->garbaged = true; f->can_x_set_window_size = false; f->after_make_frame = false; - f->tool_bar_redisplayed_once = false; f->column_width = 1; /* !FRAME_WINDOW_P value. */ f->line_height = 1; /* !FRAME_WINDOW_P value. */ #ifdef HAVE_WINDOW_SYSTEM @@ -3634,7 +3633,6 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) #endif /* Recalculate toolbar height. */ f->n_tool_bar_rows = 0; - f->tool_bar_redisplayed_once = false; /* Ensure we redraw it. */ clear_current_matrices (f); diff --git a/src/frame.h b/src/frame.h index 17e356d..546bede 100644 --- a/src/frame.h +++ b/src/frame.h @@ -335,10 +335,6 @@ struct frame /* Set to true after this frame was made by `make-frame'. */ bool_bf after_make_frame : 1; - /* True means tool bar has been redisplayed at least once in current - session. */ - bool_bf tool_bar_redisplayed_once : 1; - /* Bitfield area ends here. */ /* Number of lines (rounded up) of tool bar. REMOVE THIS */ diff --git a/src/w32fns.c b/src/w32fns.c index d8e22e2..48218e3 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1763,10 +1763,8 @@ x_change_tool_bar_height (struct frame *f, int height) f->n_tool_bar_rows = 0; adjust_frame_size (f, -1, -1, - ((!f->tool_bar_redisplayed_once - && (NILP (fullscreen = - get_frame_param (f, Qfullscreen)) - || EQ (fullscreen, Qfullwidth))) ? 1 + ((NILP (fullscreen = get_frame_param (f, Qfullscreen)) + || EQ (fullscreen, Qfullwidth)) ? 1 : (old_height == 0 || height == 0) ? 2 : 4), false, Qtool_bar_lines); diff --git a/src/xdisp.c b/src/xdisp.c index bb31697..b863077 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13735,18 +13735,6 @@ redisplay_internal (void) continue; retry_frame: - -#if defined (HAVE_WINDOW_SYSTEM) && !defined (USE_GTK) && !defined (HAVE_NS) - /* Redisplay internal tool bar if this is the first time so we - can adjust the frame height right now, if necessary. */ - if (!f->tool_bar_redisplayed_once) - { - if (redisplay_tool_bar (f)) - adjust_frame_glyphs (f); - f->tool_bar_redisplayed_once = true; - } -#endif - if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf) { bool gcscrollbars diff --git a/src/xfns.c b/src/xfns.c index 0079e7b..42d32f6 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1189,10 +1189,8 @@ x_change_tool_bar_height (struct frame *f, int height) f->n_tool_bar_rows = 0; adjust_frame_size (f, -1, -1, - ((!f->tool_bar_redisplayed_once - && (NILP (fullscreen = - get_frame_param (f, Qfullscreen)) - || EQ (fullscreen, Qfullwidth))) ? 1 + ((NILP (fullscreen = get_frame_param (f, Qfullscreen)) + || EQ (fullscreen, Qfullwidth)) ? 1 : (old_height == 0 || height == 0) ? 2 : 4), false, Qtool_bar_lines); commit 31ff037ab849a8d5d9b871a8927154ffb38a8694 Author: Eli Zaretskii Date: Wed Sep 16 12:56:45 2015 +0300 Restore some of the quoting in the manuals * doc/lispref/windows.texi (Coordinates and Windows) (Coordinates and Windows): * doc/lispref/variables.texi (Lexical Binding) (File Local Variables): * doc/lispref/text.texi (Format Properties): * doc/lispref/symbols.texi (Symbol Components): * doc/lispref/strings.texi (Creating Strings): * doc/lispref/sequences.texi (Sequence Functions): * doc/lispref/searching.texi (Regexp Special, Regexp Search) (Search and Replace): * doc/lispref/processes.texi (Bindat Spec): * doc/lispref/os.texi (Idle Timers): * doc/lispref/objects.texi (Basic Char Syntax): * doc/lispref/numbers.texi (Float Basics, Random Numbers): * doc/lispref/nonascii.texi (Character Properties): * doc/lispref/modes.texi (Major Mode Conventions, Mode Hooks) (Mode Line Variables): * doc/lispref/minibuf.texi (Text from Minibuffer): * doc/lispref/loading.texi (Autoload): * doc/lispref/keymaps.texi (Controlling Active Maps): * doc/lispref/frames.texi (Frame Layout, Size and Position) (Size Parameters, Implied Frame Resizing): * doc/lispref/files.texi (Changing Files, Magic File Names): * doc/lispref/eval.texi (Self-Evaluating Forms): * doc/lispref/display.texi (Progress, Abstract Display) (Abstract Display Example, Bidirectional Display): * doc/lispref/commands.texi (Event Mod): * doc/emacs/windows.texi (Displaying Buffers): * doc/emacs/trouble.texi (Bug Criteria, Checklist): * doc/emacs/text.texi (Enriched Text): * doc/emacs/programs.texi (MixedCase Words): * doc/emacs/picture-xtra.texi (Insert in Picture) (Tabs in Picture): * doc/emacs/misc.texi (Emacs Server, Printing): * doc/emacs/mini.texi (Minibuffer History): * doc/emacs/maintaining.texi (Old Revisions, VC Change Log) (Pulling / Pushing): * doc/emacs/killing.texi (Yanking, Cut and Paste, Clipboard): * doc/emacs/help.texi (Help, Help Echo): * doc/emacs/glossary.texi (Glossary): * doc/emacs/frames.texi (Mouse Commands, Creating Frames) (Frame Commands): * doc/emacs/files.texi (Reverting, Saving, Directories): * doc/emacs/entering.texi (Exiting): * doc/emacs/emacs.texi (Top): * doc/emacs/cmdargs.texi (Window Size X, Icons X): * doc/emacs/anti.texi (Antinews): Restore quoting of text where appropriate or replace quoting with @dfn. * doc/misc/ediff.texi (Window and Frame Configuration): * doc/lispref/processes.texi (Network Feature Testing): * doc/lispref/display.texi (Display Margins): Quote the phrase after "a.k.a." where appropriate. diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index 72452a5..d702ff7 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -13,14 +13,14 @@ greater simplicity that results from the absence of many Emacs @itemize @bullet @item -Support for displaying and editing bidirectional text has been +Support for displaying and editing ``bidirectional'' text has been removed. Text is now always displayed on the screen in a single consistent direction---left to right---regardless of the underlying script. Similarly, @kbd{C-f} and @kbd{C-b} always move the text cursor to the right and left respectively. Also, @key{RIGHT} and @key{LEFT} are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might expect, rather than moving forward or backward based on the underlying -paragraph direction. +``paragraph direction''. Users of right-to-left languages, like Arabic and Hebrew, may adapt by reading and/or editing text in left-to-right order. @@ -43,7 +43,7 @@ the text in the region; it deletes a single character instead. We have reworked how Emacs handles the clipboard and the X primary selection. Commands for killing and yanking, like @kbd{C-w} and @kbd{C-y}, use the primary selection and not the clipboard, so you can -use these commands without interfering with cutting or pasting +use these commands without interfering with ``cutting'' or ``pasting'' in other programs. The @samp{Cut}/@samp{Copy}/@samp{Paste} menu items are bound to separate clipboard commands, not to the same commands as @kbd{C-w}/@kbd{M-w}/@kbd{C-y}. diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 1385fef..fcaf87f 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -1036,7 +1036,7 @@ tool bar when it processes the specified geometry. When using one of @samp{--fullscreen}, @samp{--maximized}, @samp{--fullwidth} or @samp{--fullheight}, some window managers require you to set the variable @code{frame-resize-pixelwise} to a non-@code{nil} -value to make a frame appear truly maximized or fullscreen. +value to make a frame appear truly maximized or full-screen. Some window managers have options that can make them ignore both program-specified and user-specified positions. If these are set, @@ -1125,12 +1125,12 @@ Start Emacs in an iconified state. Disable the use of the Emacs icon. @end table - Most window managers allow you to iconify (or minimize) an + Most window managers allow you to iconify (or ``minimize'') an Emacs frame, hiding it from sight. Some window managers replace iconified windows with tiny icons, while others remove them entirely from sight. The @samp{-iconic} option tells Emacs to begin running in an iconified state, rather than showing a frame right away. -The text frame doesn't appear until you deiconify (or un-minimize) +The text frame doesn't appear until you deiconify (or ``un-minimize'') it. By default, Emacs uses an icon containing the Emacs logo. On diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 8275da9..a913579 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -638,7 +638,7 @@ Enriched Text * Enriched Indentation:: Changing the left and right margins. * Enriched Justification:: Centering, setting text flush with the left or right margin, etc. -* Enriched Properties:: The special text properties submenu. +* Enriched Properties:: The ``Special text properties'' submenu. @c The automatic texinfo menu update inserts some duplicate items here @c (faces, colors, indentation, justification, properties), because diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index afe2b11..8b8a918 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-emacs}). @end table @kindex C-x C-c diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 4bd2553..5752d02 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -340,7 +340,7 @@ that was visited in the buffer. * Customize Save:: Customizing the saving of files. * Interlocking:: How Emacs protects against simultaneous editing of one file by two users. -* Shadowing: File Shadowing. Copying files to shadows automatically. +* Shadowing: File Shadowing. Copying files to ``shadows'' automatically. * Time Stamps:: Emacs can update time stamps on saved files. @end menu @@ -941,7 +941,7 @@ buffers, type @kbd{M-x global-auto-revert-mode} to enable Global Auto-Revert mode. These minor modes do not check or revert remote files, because that is usually too slow. - One use of Auto-Revert mode is to tail a file such as a system + One use of Auto-Revert mode is to ``tail'' a file such as a system log, so that changes made to that file by other programs are continuously displayed. To do this, just move the point to the end of the buffer, and it will stay there as the file contents change. @@ -1255,8 +1255,8 @@ this, it runs the program specified by The command @kbd{M-x delete-directory} prompts for a directory name using the minibuffer, and deletes the directory if it is empty. If the directory is not empty, you will be asked whether you want to -delete it recursively. On systems that have a Trash (or Recycle -Bin) feature, you can make this command move the specified directory +delete it recursively. On systems that have a ``Trash'' (or ``Recycle +Bin'') feature, you can make this command move the specified directory to the Trash instead of deleting it outright, by changing the variable @code{delete-by-moving-to-trash} to @code{t}. @xref{Misc File Ops}, for more information about using the Trash. diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 22f9f0e..a171db7 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -197,7 +197,7 @@ deactivating the mark. @xref{Shift Selection}. @vindex mouse-wheel-follow-mouse @vindex mouse-wheel-scroll-amount @vindex mouse-wheel-progressive-speed - Some mice have a wheel which can be used for scrolling. Emacs + Some mice have a ``wheel'' which can be used for scrolling. Emacs supports scrolling windows with the mouse wheel, by default, on most graphical displays. To toggle this feature, use @kbd{M-x mouse-wheel-mode}. The variables @code{mouse-wheel-follow-mouse} and @@ -388,9 +388,9 @@ boundary to the left or right. The prefix key @kbd{C-x 5} is analogous to @kbd{C-x 4}. Whereas each @kbd{C-x 4} command pops up a buffer in a different window in the selected frame (@pxref{Pop Up Window}), the @kbd{C-x 5} commands use a -different frame. If an existing visible or iconified (minimized) +different frame. If an existing visible or iconified (a.k.a.@: ``minimized'') frame already displays the requested buffer, that frame is raised and -deiconified (un-minimized); otherwise, a new frame is created on +deiconified (``un-minimized''); otherwise, a new frame is created on the current display terminal. The various @kbd{C-x 5} commands differ in how they find or create the @@ -467,8 +467,8 @@ maximized, it fills the screen. @item @kindex @findex toggle-frame-fullscreen -Toggle fullscreen mode for the current frame. (The difference -between fullscreen and maximized is normally that the former +Toggle full-screen mode for the current frame. (The difference +between full-screen and maximized is normally that the former hides window manager decorations, giving slightly more screen space to Emacs itself.) @end table @@ -476,7 +476,7 @@ Emacs itself.) @vindex frame-resize-pixelwise Note that with some window managers you may have to customize the variable @code{frame-resize-pixelwise} to a non-@code{nil} value in -order to make a frame truly maximized or fullscreen. This +order to make a frame truly maximized or full-screen. This variable, when set to a non-@code{nil} value, in general allows resizing frames at pixel resolution, rather than in integral multiples of lines and columns. diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index ef18672..e66cd79 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi @@ -100,7 +100,7 @@ A base buffer is a buffer whose text is shared by an indirect buffer Some human languages, such as English, are written from left to right. Others, such as Arabic, are written from right to left. Emacs supports both of these forms, as well as any mixture of them---this -is bidirectional text. @xref{Bidirectional Editing}. +is ``bidirectional text''. @xref{Bidirectional Editing}. @item Bind To bind a key sequence means to give it a binding (q.v.). @@ -396,7 +396,7 @@ Variables}. @item Dired Dired is the Emacs facility that displays the contents of a file -directory and allows you to edit the directory, performing +directory and allows you to ``edit the directory'', performing operations on the files in the directory. @xref{Dired}. @item Disabled Command @@ -580,7 +580,7 @@ For more information, see @uref{http://fsf.org/, the FSF website}. @item Fringe On a graphical display (q.v.), there's a narrow portion of the frame (q.v.@:) between the text area and the window's border. These -fringes are used to display symbols that provide information about +``fringes'' are used to display symbols that provide information about the buffer text (@pxref{Fringes}). Emacs displays the fringe using a special face (q.v.@:) called @code{fringe}. @xref{Faces,fringe}. diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index 0489325..a9c63b9 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -72,7 +72,7 @@ inputs, but they all support @key{F1}.) * Language Help:: Help relating to international language support. * Misc Help:: Other help commands. * Help Files:: Commands to display auxiliary help files. -* Help Echo:: Help on active text and tooltips. +* Help Echo:: Help on active text and tooltips (``balloon help''). @end menu @iftex @@ -634,7 +634,8 @@ Emacs (@code{describe-no-warranty}). @cindex tooltips @cindex balloon help - In Emacs, stretches of active text (text that does something +@cindex active text + In Emacs, stretches of @dfn{active text} (text that does something special in response to mouse clicks or @key{RET}) often have associated help text. This includes hyperlinks in Emacs buffers, as well as parts of the mode line. On graphical displays, as well as diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index d629349..d453647 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -306,7 +306,7 @@ e.g., @kbd{C-u 4 C-y} reinserts the fourth most recent kill. On graphical displays, @kbd{C-y} first checks if another application has placed any text in the system clipboard more recently than the last Emacs kill. If so, it inserts the clipboard's text instead. -Thus, Emacs effectively treats cut or copy clipboard +Thus, Emacs effectively treats ``cut'' or ``copy'' clipboard operations performed in other applications like Emacs kills, except that they are not recorded in the kill ring. @xref{Cut and Paste}, for details. @@ -445,7 +445,7 @@ be yanked back in one place. append to the text that @kbd{M-w} copied into the kill ring. @node Cut and Paste -@section Cut and Paste Operations on Graphical Displays +@section ``Cut and Paste'' Operations on Graphical Displays @cindex cut @cindex copy @cindex paste @@ -476,7 +476,7 @@ different data type by customizing @code{x-select-request-type}. @cindex clipboard The @dfn{clipboard} is the facility that most graphical applications -use for cutting and pasting. When the clipboard exists, the kill +use for ``cutting and pasting''. When the clipboard exists, the kill and yank commands in Emacs make use of it. When you kill some text with a command such as @kbd{C-w} @@ -493,7 +493,7 @@ losing the old clipboard data---at the risk of high memory consumption if that data turns out to be large. Yank commands, such as @kbd{C-y} (@code{yank}), also use the -clipboard. If another application owns the clipboard---i.e., if +clipboard. If another application ``owns'' the clipboard---i.e., if you cut or copied text there more recently than your last kill command in Emacs---then Emacs yanks from the clipboard instead of the kill ring. @@ -512,7 +512,7 @@ change the variable @code{x-select-enable-clipboard} to @code{nil}. @vindex x-select-enable-clipboard-manager Many X desktop environments support a feature called the @dfn{clipboard manager}. If you exit Emacs while it is the current -owner of the clipboard data, and there is a clipboard manager +``owner'' of the clipboard data, and there is a clipboard manager running, Emacs transfers the clipboard data to the clipboard manager so that it is not lost. In some circumstances, this may cause a delay when exiting Emacs; if you wish to prevent Emacs from transferring diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index b1c5297..e747949 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -824,7 +824,7 @@ window. @kindex C-x v g Many version control systems allow you to view files @dfn{annotated} with per-line revision information, by typing @kbd{C-x v g} -(@code{vc-annotate}). This creates a new annotate buffer +(@code{vc-annotate}). This creates a new ``annotate'' buffer displaying the file's text, with each line colored to show how old it is. Red text is new, blue is old, and intermediate colors indicate intermediate ages. By default, the color is scaled over the @@ -836,7 +836,7 @@ arguments using the minibuffer: the revision to display and annotate (instead of the current file contents), and the time span in days the color range should cover. - From the annotate buffer, these and other color scaling options are + From the ``annotate'' buffer, these and other color scaling options are available from the @samp{VC-Annotate} menu. In this buffer, you can also use the following keys to browse the annotations of past revisions, view diffs, or view log entries: @@ -901,11 +901,11 @@ Display the change history for the current repository (@code{vc-print-root-log}). @item C-x v I -Display the changes that a pull operation will retrieve +Display the changes that a ``pull'' operation will retrieve (@code{vc-log-incoming}). @item C-x v O -Display the changes that will be sent by the next push operation +Display the changes that will be sent by the next ``push'' operation (@code{vc-log-outgoing}). @end table @@ -1355,13 +1355,13 @@ commit will be committed to that specific branch. @table @kbd @item C-x v + On a decentralized version control system, update the current branch -by pulling in changes from another location. +by ``pulling in'' changes from another location. On a centralized version control system, update the current VC fileset. @item C-x v P -On a decentralized version control system, push changes from the +On a decentralized version control system, ``push'' changes from the current branch to another location. This concept does not exist for centralized version control systems. @end table diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 7357372..058f385 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -620,7 +620,7 @@ fetching later entries into the minibuffer. entries in the minibuffer history (e.g., if you haven't previously typed @kbd{M-p}), Emacs tries fetching from a list of default arguments: values that you are likely to enter. You can think of this -as moving through the future history. +as moving through the ``future history''. If you edit the text inserted by the @kbd{M-p} or @kbd{M-n} minibuffer history commands, this does not change its entry in the diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 2eee3dd..7fad826 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1515,7 +1515,7 @@ command history, or other kinds of information with any existing Emacs process. You can solve this problem by setting up Emacs as an @dfn{edit -server}, so that it listens for external edit requests and acts +server}, so that it ``listens'' for external edit requests and acts accordingly. There are two ways to start an Emacs server: @itemize @@ -1808,7 +1808,7 @@ as detailed below, or using the @samp{File} menu on the menu bar. @findex htmlfontify-buffer Aside from the commands described in this section, you can also print hardcopies from Dired (@pxref{Operating on Files}) and the diary -(@pxref{Displaying the Diary}). You can also print an Emacs +(@pxref{Displaying the Diary}). You can also ``print'' an Emacs buffer to HTML with the command @kbd{M-x htmlfontify-buffer}, which converts the current buffer to a HTML file, replacing Emacs faces with CSS-based markup. Furthermore, Org mode allows you to print Org diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index 4e22d75..8a087ac 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -164,18 +164,18 @@ Move up after insertion (@code{picture-movement-up}). Move down after insertion (@code{picture-movement-down}). @item C-c ` @itemx C-c @key{Home} -Move up and left (northwest) after insertion (@code{picture-movement-nw}). +Move up and left (``northwest'') after insertion (@code{picture-movement-nw}). @item C-c ' @itemx C-c @key{prior} -Move up and right (northeast) after insertion +Move up and right (``northeast'') after insertion (@code{picture-movement-ne}). @item C-c / @itemx C-c @key{End} -Move down and left (southwest) after insertion +Move down and left (``southwest'') after insertion @*(@code{picture-movement-sw}). @item C-c \ @itemx C-c @key{next} -Move down and right (southeast) after insertion +Move down and right (``southeast'') after insertion @*(@code{picture-movement-se}). @end table @@ -197,12 +197,12 @@ C-b} (@code{picture-motion-reverse}) moves in the opposite direction. Two kinds of tab-like action are provided in Picture mode. Use @kbd{M-@key{TAB}} (@code{picture-tab-search}) for context-based tabbing. With no argument, it moves to a point underneath the next -interesting character that follows whitespace in the previous +``interesting'' character that follows whitespace in the previous nonblank line. ``Next'' here means ``appearing at a horizontal position greater than the one point starts out at''. With an argument, as in @kbd{C-u M-@key{TAB}}, this command moves to the next such interesting character in the current line. @kbd{M-@key{TAB}} does not change the -text; it only moves point. Interesting characters are defined by +text; it only moves point. ``Interesting'' characters are defined by the variable @code{picture-tab-chars}, which should define a set of characters. The syntax for this variable is like the syntax used inside of @samp{[@dots{}]} in a regular expression---but without the @samp{[} diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 0045455..1f2c8b1 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1340,7 +1340,7 @@ based on the spell-checker's dictionary. @xref{Spelling}. @section MixedCase Words @cindex camel case - Some programming styles make use of mixed-case (or CamelCase) + Some programming styles make use of mixed-case (or ``CamelCase'') symbols like @samp{unReadableSymbol}. (In the GNU project, we recommend using underscores to separate words within an identifier, rather than using case distinctions.) Emacs has various features to make it easier diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 0ade392..2843eed 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -2071,7 +2071,7 @@ serves as an example of the features of Enriched mode. * Enriched Indentation:: Changing the left and right margins. * Enriched Justification:: Centering, setting text flush with the left or right margin, etc. -* Enriched Properties:: The special text properties submenu. +* Enriched Properties:: The ``special text properties'' submenu. @end menu @node Enriched Mode diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 3527250..087681b 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -538,10 +538,10 @@ not feel obliged to read this list before reporting a bug. @cindex bug criteria @cindex what constitutes an Emacs bug - If Emacs accesses an invalid memory location or exits with an -operating system error message that indicates a problem in the program -(as opposed to something like ``disk full''), then it is certainly a -bug. + If Emacs accesses an invalid memory location (a.k.a.@: +``segmentation fault'') or exits with an operating system error +message that indicates a problem in the program (as opposed to +something like ``disk full''), then it is certainly a bug. If the Emacs display does not correspond properly to the contents of the buffer, then it is a bug. But you should check that features like @@ -964,7 +964,7 @@ More detailed advice and other useful techniques for debugging Emacs are available in the file @file{etc/DEBUG} in the Emacs distribution. That file also includes instructions for investigating problems whereby Emacs stops responding (many people assume that Emacs is -hung, whereas in fact it might be in an infinite loop). +``hung'', whereas in fact it might be in an infinite loop). To find the file @file{etc/DEBUG} in your Emacs installation, use the directory name stored in the variable @code{data-directory}. diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index cb37222..d844f3e 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -339,7 +339,7 @@ in response to a user command. There are several different ways in which commands do this. Many commands, like @kbd{C-x C-f} (@code{find-file}), display the -buffer by taking over the selected window, expecting that the +buffer by ``taking over'' the selected window, expecting that the user's attention will be diverted to that buffer. These commands usually work by calling @code{switch-to-buffer} internally (@pxref{Select Buffer}). diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 8642f6a..7ddf5ee 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2621,7 +2621,7 @@ then continues to wait for a valid input character, or keyboard-quit. from @code{read-event}. @defvar extra-keyboard-modifiers -This variable lets Lisp programs press the modifier keys on the +This variable lets Lisp programs ``press'' the modifier keys on the keyboard. The value is a character. Only the modifiers of the character matter. Each time the user types a keyboard key, it is altered as if those modifier keys were held down. For instance, if diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 2ae2857..f3713bf 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -386,7 +386,7 @@ results of @code{point-min} and @code{point-max} correspondingly. Alternatively, you can set @var{min-value} and @var{max-value} to @code{nil}. In that case, the progress reporter does not report -process percentages; it instead displays a spinner that rotates a +process percentages; it instead displays a ``spinner'' that rotates a notch each time you update the progress reporter. If @var{min-value} and @var{max-value} are numbers, you can give the @@ -4644,7 +4644,7 @@ variables: @defvar left-margin-width This variable specifies the width of the left margin, in character -cell (a.k.a.@: column) units. It is buffer-local in all buffers. +cell (a.k.a.@: ``column'') units. It is buffer-local in all buffers. A value of @code{nil} means no left marginal area. @end defvar @@ -5883,8 +5883,8 @@ in the search, instead of starting at the next button. The Ewoc package constructs buffer text that represents a structure of Lisp objects, and updates the text to follow changes in that -structure. This is like the view component in the -model--view--controller design paradigm. Ewoc means ``Emacs's +structure. This is like the ``view'' component in the +``model--view--controller'' design paradigm. Ewoc means ``Emacs's Widget for Object Collections''. An @dfn{ewoc} is a structure that organizes information required to @@ -6164,7 +6164,7 @@ The buffer is in Color Components mode." @cindex controller part, model/view/controller This example can be extended to be a color selection widget (in -other words, the controller part of the model--view--controller +other words, the ``controller'' part of the ``model--view--controller'' design paradigm) by defining commands to modify @code{colorcomp-data} and to finish the selection process, and a keymap to tie it all together conveniently. @@ -6822,9 +6822,9 @@ positions do not increase monotonically with string or buffer position. In performing this @dfn{bidirectional reordering}, Emacs follows the Unicode Bidirectional Algorithm (a.k.a.@: @acronym{UBA}), which is described in Annex #9 of the Unicode standard -(@url{http://www.unicode.org/reports/tr9/}). Emacs provides a Full -Bidirectionality class implementation of the @acronym{UBA}, -consistent with the requirements of the Unicode Standard v7.0. +(@url{http://www.unicode.org/reports/tr9/}). Emacs provides a ``Full +Bidirectionality'' class implementation of the @acronym{UBA}, +consistent with the requirements of the Unicode Standard v8.0. @defvar bidi-display-reordering If the value of this buffer-local variable is non-@code{nil} (the diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index a7c44c6..067dbd2 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -146,7 +146,7 @@ contents unchanged. @result{} 123 @end group @group -(eval '123) ; @r{Evaluated by hand---result is the same.} +(eval '123) ; @r{Evaluated "by hand"---result is the same.} @result{} 123 @end group @group diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 735e08e..ffc7936 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1603,7 +1603,7 @@ file. This works only on some operating systems, and only if you have the correct permissions to do so. If the optional argument @var{preserve-permissions} is non-@code{nil}, -this function copies the file modes (or permissions) of +this function copies the file modes (or ``permissions'') of @var{oldname} to @var{newname}, as well as the Access Control List and SELinux context (if any). @xref{Information about Files}. @@ -2753,7 +2753,7 @@ no prefix argument is given, and @code{nil} otherwise. @end deffn @node Magic File Names -@section Making Certain File Names Magic +@section Making Certain File Names ``Magic'' @cindex magic file names You can implement special handling for certain file names. This is diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 473c825..629ee5c 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -500,7 +500,7 @@ Position}). @cindex external border The @dfn{external border} is part of the decorations supplied by the window manager. It's typically used for resizing the frame with the -mouse. The external border is normally not shown on fullboth and +mouse. The external border is normally not shown on ``fullboth'' and maximized frames (@pxref{Size Parameters}) and doesn't exist for text terminal frames. @@ -841,7 +841,7 @@ of its character size, however, may: be ignored, cause a rounding (GTK+), or be accepted (Lucid, Motif, MS-Windows). With some window managers you may have to set this to non-@code{nil} in -order to make a frame appear truly maximized or fullscreen. +order to make a frame appear truly maximized or full-screen. @end defopt @defun set-frame-size frame width height pixelwise @@ -914,7 +914,7 @@ resize the frame's outer size, hence this will alter the number of displayed lines. Occasionally, such @dfn{implied frame resizing} may be unwanted, for -example, when the frame is maximized or made fullscreen (where it's +example, when the frame is maximized or made full-screen (where it's turned off by default). In other cases you can disable implied resizing with the following option: @@ -1288,34 +1288,34 @@ or both. Its value can be @code{fullwidth}, @code{fullheight}, @code{fullboth}, or @code{maximized}. A @dfn{fullwidth} frame is as wide as possible, a @dfn{fullheight} frame is as tall as possible, and a @dfn{fullboth} frame is both as wide and as tall as possible. A -@dfn{maximized} frame is like a fullboth frame, except that it usually +@dfn{maximized} frame is like a ``fullboth'' frame, except that it usually keeps its title bar and the buttons for resizing and closing the frame. Also, maximized frames typically avoid hiding -any task bar or panels displayed on the desktop. A fullboth frame, +any task bar or panels displayed on the desktop. A ``fullboth'' frame, on the other hand, usually omits the title bar and occupies the entire available screen space. -Fullheight and fullwidth frames are more similar to maximized +Full-height and full-width frames are more similar to maximized frames in this regard. However, these typically display an external border which might be absent with maximized frames. Hence the heights -of maximized and fullheight frames and the widths of maximized and -fullwidth frames often differ by a few pixels. +of maximized and full-height frames and the widths of maximized and +full-width frames often differ by a few pixels. With some window managers you may have to customize the variable @code{frame-resize-pixelwise} (@pxref{Size and Position}) in order to -make a frame truly appear maximized or fullscreen. Moreover, +make a frame truly appear maximized or full-screen. Moreover, some window managers might not support smooth transition between the -various fullscreen or maximization states. Customizing the variable +various full-screen or maximization states. Customizing the variable @code{x-frame-normalize-before-maximize} can help to overcome that. @vindex fullscreen-restore, a frame parameter @item fullscreen-restore This parameter specifies the desired fullscreen state of the frame after invoking the @code{toggle-frame-fullscreen} command (@pxref{Frame -Commands,,, emacs, The GNU Emacs Manual}) in the fullboth state. +Commands,,, emacs, The GNU Emacs Manual}) in the ``fullboth'' state. Normally this parameter is installed automatically by that command when toggling the state to fullboth. If, however, you start Emacs in the -fullboth state, you have to specify the desired behavior in your initial +``fullboth'' state, you have to specify the desired behavior in your initial file as, for example @example diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index d665587..9bea4b0 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -929,7 +929,7 @@ sequences entered using the menu bar, even if they do not affect the menu bar display. So if a menu bar key sequence comes in, you should clear the variables before looking up and executing that key sequence. Modes that use the variables would typically do this anyway; normally -they respond to events that they do not handle by unreading them and +they respond to events that they do not handle by ``unreading'' them and exiting. @end defvar diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index f5352da..82de765 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -456,7 +456,7 @@ Autoloading can also be triggered by looking up the documentation of the function or macro (@pxref{Documentation Basics}). There are two ways to set up an autoloaded function: by calling -@code{autoload}, and by writing a magic comment in the +@code{autoload}, and by writing a ``magic'' comment in the source before the real definition. @code{autoload} is the low-level primitive for autoloading; any Lisp program can call @code{autoload} at any time. Magic comments are the most convenient way to make a function diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index a035459..96c1020 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -143,7 +143,7 @@ reads the text and returns the resulting Lisp object, unevaluated. The argument @var{default} specifies default values to make available through the history commands. It should be a string, a list of strings, or @code{nil}. The string or strings become the minibuffer's -future history, available to the user with @kbd{M-n}. +``future history'', available to the user with @kbd{M-n}. If @var{read} is non-@code{nil}, then @var{default} is also used as the input to @code{read}, if the user enters empty input. @@ -194,8 +194,8 @@ in @code{read-from-minibuffer} it should be a string, a list of strings, or @code{nil}, which is equivalent to an empty string. When @var{default} is a string, that string is the default value. When it is a list of strings, the first string is the default value. (All -these strings are available to the user in the future minibuffer -history.) +these strings are available to the user in the ``future minibuffer +history''.) This function works by calling the @code{read-from-minibuffer} function: @@ -262,8 +262,8 @@ The last string or pattern used in query-replace commands. The function now has a list of regular expressions that it passes to @code{read-from-minibuffer} to obtain the user's input. The first element of the list is the default result in case of empty input. All -elements of the list are available to the user as the future -minibuffer history list (@pxref{Minibuffer History, future list,, +elements of the list are available to the user as the ``future +minibuffer history'' list (@pxref{Minibuffer History, future list,, emacs, The GNU Emacs Manual}). The optional argument @var{history}, if non-@code{nil}, is a symbol diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index cbc8b78..8d7e29f 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -305,7 +305,7 @@ which documentation to print. @item The major mode command should set the variable @code{mode-name} to the -pretty name of the mode, usually a string (but see @ref{Mode Line +``pretty'' name of the mode, usually a string (but see @ref{Mode Line Data}, for other possible forms). The name of the mode appears in the mode line. @@ -901,7 +901,7 @@ such a major mode, please correct it to follow these conventions. When you defined a major mode using @code{define-derived-mode}, it automatically makes sure these conventions are followed. If you -define a major mode by hand, not using @code{define-derived-mode}, +define a major mode ``by hand'', not using @code{define-derived-mode}, use the following functions to handle these conventions automatically. @defun run-mode-hooks &rest hookvars @@ -1974,7 +1974,7 @@ This variable is used to identify @code{emacsclient} frames. The following three variables are used in @code{mode-line-modes}: @defvar mode-name -This buffer-local variable holds the pretty name of the current +This buffer-local variable holds the ``pretty'' name of the current buffer's major mode. Each major mode should set this variable so that the mode name will appear in the mode line. The value does not have to be a string, but can use any of the data types valid in a mode-line diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 99d128c..fb76de1 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -483,7 +483,7 @@ Corresponds to the Unicode @code{Numeric_Value} property for characters whose @code{Numeric_Type} is @samp{Decimal}. The value is an integer, or @code{nil} if the character has no decimal digit value. For unassigned codepoints, the value is @code{nil}, which means -@acronym{NaN}, or not a number. +@acronym{NaN}, or ``not a number''. @item digit-value Corresponds to the Unicode @code{Numeric_Value} property for diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index b329a10..3c70d2f 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -224,7 +224,7 @@ distinguish them. @cindex NaN The @acronym{IEEE} floating-point standard supports positive infinity and negative infinity as floating-point values. It also -provides for a class of values called NaN or not a number; +provides for a class of values called NaN, or ``not a number''; numerical functions return such values in cases where there is no correct answer. For example, @code{(/ 0.0 0.0)} returns a NaN@. Although NaN values carry a sign, for practical purposes there is no other @@ -1217,7 +1217,8 @@ fashion. The numbers are not truly random, but they have certain properties that mimic a random series. For example, all possible values occur equally often in a pseudo-random series. - Pseudo-random numbers are generated from a seed. Starting from +@cindex seed, for random number generation + Pseudo-random numbers are generated from a @dfn{seed value}. Starting from any given seed, the @code{random} function always generates the same sequence of numbers. By default, Emacs initializes the random seed at startup, in such a way that the sequence of values of @code{random} diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 4a0ccc8..0a19274 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -310,7 +310,7 @@ vertical tab, formfeed, space, return, del, and escape as @samp{?\a}, @samp{?\b}, @samp{?\t}, @samp{?\n}, @samp{?\v}, @samp{?\f}, @samp{?\s}, @samp{?\r}, @samp{?\d}, and @samp{?\e}, respectively. (@samp{?\s} followed by a dash has a different meaning---it applies -the super modifier to the following character.) Thus, +the Super modifier to the following character.) Thus, @example ?\a @result{} 7 ; @r{control-g, @kbd{C-g}} diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index ca4b1f0..cb58303 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1922,7 +1922,7 @@ This is a convenient way to test whether Emacs is idle. @end defun The main use of @code{current-idle-time} is when an idle timer -function wants to take a break for a while. It can set up another +function wants to ``take a break'' for a while. It can set up another idle timer to call the same function again, after a few seconds more idleness. Here's an example: diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 75b29c1..92f98ab 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -409,7 +409,7 @@ mentioned here only for completeness. @deffn Command previous-line count @cindex goal column This function moves point up @var{count} lines (down if @var{count} -is negative). In moving, it attempts to keep point in the goal column +is negative). In moving, it attempts to keep point in the @dfn{goal column} (normally the same column that it was at the beginning of the move). If there is no character in the target line exactly under the current diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index a62a8b6..845db0d 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -2538,7 +2538,7 @@ Non-@code{nil} if non-blocking connect is supported. @item (:type datagram) Non-@code{nil} if datagrams are supported. @item (:family local) -Non-@code{nil} if local (a.k.a.@: UNIX domain) sockets are supported. +Non-@code{nil} if local (a.k.a.@: ``UNIX domain'') sockets are supported. @item (:family ipv6) Non-@code{nil} if IPv6 is supported. @item (:service t) @@ -2837,8 +2837,8 @@ is automatically recognized as risky. A field's @dfn{type} describes the size (in bytes) of the object that the field represents and, in the case of multibyte fields, how the bytes are ordered within the field. The two possible orderings -are big endian (also known as network byte ordering) and -little endian. For instance, the number @code{#x23cd} (decimal +are @dfn{big endian} (also known as ``network byte ordering'') and +@dfn{little endian}. For instance, the number @code{#x23cd} (decimal 9165) in big endian would be the two bytes @code{#x23} @code{#xcd}; and in little endian, @code{#xcd} @code{#x23}. Here are the possible type values: diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 6dc4a16..adaf431 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -359,7 +359,7 @@ preceding expression either once or not at all. For example, @item @samp{*?}, @samp{+?}, @samp{??} @cindex non-greedy repetition characters in regexp -These are non-greedy variants of the operators @samp{*}, @samp{+} +These are @dfn{non-greedy} variants of the operators @samp{*}, @samp{+} and @samp{?}. Where those operators match the largest possible substring (consistent with matching the entire containing expression), the non-greedy variants match the smallest possible substring @@ -1127,7 +1127,7 @@ avoids modifying the match data. @defun looking-at regexp This function determines whether the text in the current buffer directly following point matches the regular expression @var{regexp}. ``Directly -following'' means precisely that: the search is anchored and it can +following'' means precisely that: the search is ``anchored'' and it can succeed only starting with the first character following point. The result is @code{t} if so, @code{nil} otherwise. @@ -1766,7 +1766,7 @@ to the functions that use this map. Prefix keys are not supported; each key binding must be for a single-event key sequence. This is because the functions don't use @code{read-key-sequence} to get the input; instead, they read a single -event and look it up by hand. +event and look it up ``by hand''. @end itemize @end defvar diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index f38aa35..6292c02 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -342,7 +342,7 @@ order elements according to different criteria. The argument @var{predicate} must be a function that accepts two arguments. It is called with two elements of @var{sequence}. To get an increasing order sort, the @var{predicate} should return non-@code{nil} if the -first element is less than the second, or @code{nil} if not. +first element is ``less'' than the second, or @code{nil} if not. The comparison function @var{predicate} must give reliable results for any given pair of arguments, at least within a single call to diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index b2fe60c..ac11dd9 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -343,7 +343,7 @@ three previous examples are rarely relevant: @end example Somewhat odd, but predictable, behavior can occur for certain -non-greedy values of @var{separators} that can prefer empty +``non-greedy'' values of @var{separators} that can prefer empty matches over non-empty matches. Again, such values rarely occur in practice: diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index e6dc4df..2605a3e 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -35,7 +35,7 @@ otherwise. @section Symbol Components @cindex symbol components - Each symbol has four components (or cells), each of which + Each symbol has four components (or ``cells''), each of which references another object: @table @asis diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 45e9232..6d9d26f 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -3487,7 +3487,7 @@ are used for representing formatted text. @xref{Filling}, and @table @code @item hard -If a newline character has this property, it is a hard newline. +If a newline character has this property, it is a ``hard'' newline. The fill commands do not alter hard newlines and do not move words across them. However, this property takes effect only if the @code{use-hard-newlines} minor mode is enabled. @xref{Hard and Soft diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 76dc8e8..1d92094 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -991,7 +991,7 @@ environments in this way; only specialized programs like debuggers.) @cindex closures, example of using Lexical bindings have indefinite extent. Even after a binding construct has finished executing, its lexical environment can be -kept around in Lisp objects called @dfn{closures}. A closure is +``kept around'' in Lisp objects called @dfn{closures}. A closure is created when you define a named or anonymous function with lexical binding enabled. @xref{Closures}, for details. @@ -1722,7 +1722,7 @@ values by files. Any value specified for one of these variables is completely ignored. @end defvar - The @samp{Eval:} variable is also a potential loophole, so Emacs + The @samp{Eval:} ``variable'' is also a potential loophole, so Emacs normally asks for confirmation before handling it. @defopt enable-local-eval @@ -1735,7 +1735,7 @@ the user what to do for each file. The default value is @code{maybe}. @defopt safe-local-eval-forms This variable holds a list of expressions that are safe to -evaluate when found in the @samp{Eval:} variable in a file +evaluate when found in the @samp{Eval:} ``variable'' in a file local variables list. @end defopt diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 3479e18..00161b2 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -3702,8 +3702,8 @@ respectively. For the following functions, X and Y coordinates are reported in integer character units, i.e., numbers of lines and columns -respectively. On a graphical display, each line and column -corresponds to the height and width of a default character specified by +respectively. On a graphical display, each ``line'' and ``column'' +corresponds to the height and width of the default character specified by the frame's default font (@pxref{Frame Font}). @defun window-edges &optional window body absolute pixelwise @@ -3903,7 +3903,7 @@ visible in some window: @end group @end example -On a graphical terminal this form warps the mouse cursor to the +On a graphical terminal this form ``warps'' the mouse cursor to the upper left corner of the glyph at the selected window's point. A position calculated this way can be also used to show a tooltip window there. diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 552e3be..f7876a3 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -1388,7 +1388,7 @@ different frames. Ediff respects these arrangements, automatically adapting itself to the multi-frame mode. Ediff uses the following variables to set up its control panel -(a.k.a.@: control buffer, a.k.a.@: quick help window): +(a.k.a.@: ``control buffer'', a.k.a.@: ``quick help window''): @table @code @item ediff-control-frame-parameters