From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#22884: 25.0.92; C/l mode editing takes waaaayy too long Date: Thu, 3 Mar 2016 09:54:54 -0800 Organization: UCLA Computer Science Department Message-ID: <56D87A6E.8090202@cs.ucla.edu> References: <56D72C35.4090708@cs.ucla.edu> <20160303124910.GA2852@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070905070406070408070902" X-Trace: ger.gmane.org 1457027796 30325 80.91.229.3 (3 Mar 2016 17:56:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Mar 2016 17:56:36 +0000 (UTC) Cc: 22884@debbugs.gnu.org To: Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 03 18:56:22 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1abXU5-0001aL-Ox for geb-bug-gnu-emacs@m.gmane.org; Thu, 03 Mar 2016 18:56:22 +0100 Original-Received: from localhost ([::1]:36613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abXU5-00062j-9A for geb-bug-gnu-emacs@m.gmane.org; Thu, 03 Mar 2016 12:56:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abXTt-0005rP-8J for bug-gnu-emacs@gnu.org; Thu, 03 Mar 2016 12:56:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abXTm-00009z-HH for bug-gnu-emacs@gnu.org; Thu, 03 Mar 2016 12:56:09 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:35067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abXTm-00009r-C8; Thu, 03 Mar 2016 12:56:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1abXTm-0005nR-6P; Thu, 03 Mar 2016 12:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org, bug-cc-mode@gnu.org Resent-Date: Thu, 03 Mar 2016 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22884 X-GNU-PR-Package: emacs,cc-mode X-GNU-PR-Keywords: Original-Received: via spool by 22884-submit@debbugs.gnu.org id=B22884.145702771222221 (code B ref 22884); Thu, 03 Mar 2016 17:56:02 +0000 Original-Received: (at 22884) by debbugs.gnu.org; 3 Mar 2016 17:55:12 +0000 Original-Received: from localhost ([127.0.0.1]:60427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1abXSw-0005mI-8G for submit@debbugs.gnu.org; Thu, 03 Mar 2016 12:55:12 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:52905) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1abXSs-0005lg-0h for 22884@debbugs.gnu.org; Thu, 03 Mar 2016 12:55:08 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 139E6160724; Thu, 3 Mar 2016 09:55:00 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id BAEkPi5Oxxw4; Thu, 3 Mar 2016 09:54:54 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id B1EC9160FF5; Thu, 3 Mar 2016 09:54:54 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ibQZLNo0VRGa; Thu, 3 Mar 2016 09:54:54 -0800 (PST) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 86A2B160724; Thu, 3 Mar 2016 09:54:54 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 In-Reply-To: <20160303124910.GA2852@acm.fritz.box> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:114354 Archived-At: This is a multi-part message in MIME format. --------------070905070406070408070902 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 03/03/2016 04:49 AM, Alan Mackenzie wrote: > Inserting a backslash at the beginning of L14 solves the problem, as > does setting open-paren-in-column-0-is-defun-start to nil. I presume the latter is not really on the table. We can't put a backslash there, as it's license text and shouldn't be fiddled with in that way. We could fold it differently (as in the attached proposed patch, which does this only for config.h and friends). > The next problem is that there are around 324 occurrences of "(" at > column zero in the src directory, and quite a few in lib and lib-src. > Most of them are in comments, some of them are parameter lists, and > some of them (e.g. in lisp.h) are wierd constructs of some sort. These > contravene GNU coding standards and really need sorting out. The lisp.h constructs are weird, but they don't violate the GNU coding standards as the parens at the start of a line do indeed mark the start of a function definition. Do these parens break cc-mode somehow? If so, what's the breakage? and how would you suggest reformatting lisp.h (and/or fixing cc-mode)? The attached proposed patch fixes all the problems I found, except (1) it leaves license wording alone for the most part (config.h excepted, since the performance disaster is there), and (2) it leaves the weird lisp.h constructs alone as per the above paragraph. Is this the sort of thing you had in mind (except I guess we need to fix (1) too?). --------------070905070406070408070902 Content-Type: text/x-patch; name="emacs.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="emacs.diff" diff --git a/configure.ac b/configure.ac index d42b42e..370cb54 100644 --- a/configure.ac +++ b/configure.ac @@ -5194,8 +5194,8 @@ This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +the Free Software Foundation, either version 3 of the License, or (at +your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/lib-src/etags.c b/lib-src/etags.c index 182cb4c..a15c950 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -680,8 +680,8 @@ static const char *Objc_suffixes [] = static const char Objc_help [] = "In Objective C code, tags include Objective C definitions for classes,\n\ class categories, methods and protocols. Tags for variables and\n\ -functions in classes are named 'CLASS::VARIABLE' and 'CLASS::FUNCTION'.\n\ -(Use --help --lang=c --lang=objc --lang=java for full help.)"; +functions in classes are named 'CLASS::VARIABLE' and 'CLASS::FUNCTION'.\ +\n(Use --help --lang=c --lang=objc --lang=java for full help.)"; static const char *Pascal_suffixes [] = { "p", "pas", NULL }; diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 833ea50..d727726 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -1,8 +1,7 @@ /* Convert files for Emacs Hexl mode. Copyright (C) 1989, 2001-2016 Free Software Foundation, Inc. -Author: Keith Gabryelski -(according to authors.el) +Author: Keith Gabryelski (according to authors.el) This file is not considered part of GNU Emacs. diff --git a/nt/preprep.c b/nt/preprep.c index 303e2ef..a74c31c 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -34,11 +34,10 @@ along with GNU Emacs. If not, see . /* Include relevant definitions from IMAGEHLP.H, which can be found in \\win32sdk\mstools\samples\image\include\imagehlp.h. */ -PIMAGE_NT_HEADERS -(__stdcall * pfnCheckSumMappedFile) (LPVOID BaseAddress, - DWORD_PTR FileLength, - PDWORD_PTR HeaderSum, - PDWORD_PTR CheckSum); +PIMAGE_NT_HEADERS (__stdcall * pfnCheckSumMappedFile) (LPVOID BaseAddress, + DWORD_PTR FileLength, + PDWORD_PTR HeaderSum, + PDWORD_PTR CheckSum); #undef min #undef max diff --git a/src/buffer.c b/src/buffer.c index 653e3fe..dba5b3d 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1044,7 +1044,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. @@ -3793,10 +3793,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) { @@ -6028,7 +6028,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' @@ -6045,7 +6045,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.) @@ -6090,7 +6090,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 @@ -6250,7 +6250,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/buffer.h b/src/buffer.h index 5783bfb..daeff24 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -352,9 +352,9 @@ extern void enlarge_buffer_text (struct buffer *, ptrdiff_t); /* Convert PTR, the address of a byte in the buffer, into a byte position. */ #define PTR_BYTE_POS(ptr) \ -((ptr) - (current_buffer)->text->beg \ - - (ptr - (current_buffer)->text->beg <= GPT_BYTE - BEG_BYTE ? 0 : GAP_SIZE) \ - + BEG_BYTE) + ((ptr) - (current_buffer)->text->beg \ + - (ptr - (current_buffer)->text->beg <= GPT_BYTE - BEG_BYTE ? 0 : GAP_SIZE) \ + + BEG_BYTE) /* Return character at byte position POS. See the caveat WARNING for FETCH_MULTIBYTE_CHAR below. */ @@ -386,24 +386,24 @@ extern void enlarge_buffer_text (struct buffer *, ptrdiff_t); Note that both arguments can be computed more than once. */ #define BUF_BYTE_ADDRESS(buf, pos) \ -((buf)->text->beg + (pos) - BEG_BYTE \ - + ((pos) >= (buf)->text->gpt_byte ? (buf)->text->gap_size : 0)) + ((buf)->text->beg + (pos) - BEG_BYTE \ + + ((pos) >= (buf)->text->gpt_byte ? (buf)->text->gap_size : 0)) /* Return the address of character at char position POS in buffer BUF. Note that both arguments can be computed more than once. */ #define BUF_CHAR_ADDRESS(buf, pos) \ -((buf)->text->beg + buf_charpos_to_bytepos ((buf), (pos)) - BEG_BYTE \ - + ((pos) >= (buf)->text->gpt ? (buf)->text->gap_size : 0)) + ((buf)->text->beg + buf_charpos_to_bytepos ((buf), (pos)) - BEG_BYTE \ + + ((pos) >= (buf)->text->gpt ? (buf)->text->gap_size : 0)) /* Convert PTR, the address of a char in buffer BUF, into a character position. */ #define BUF_PTR_BYTE_POS(buf, ptr) \ -((ptr) - (buf)->text->beg \ - - (ptr - (buf)->text->beg <= BUF_GPT_BYTE (buf) - BEG_BYTE \ - ? 0 : BUF_GAP_SIZE ((buf))) \ - + BEG_BYTE) + ((ptr) - (buf)->text->beg \ + - (ptr - (buf)->text->beg <= BUF_GPT_BYTE (buf) - BEG_BYTE \ + ? 0 : BUF_GAP_SIZE ((buf))) \ + + BEG_BYTE) /* Return the character at byte position POS in buffer BUF. */ diff --git a/src/bytecode.c b/src/bytecode.c index 0befe65..b111ac1 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1996,9 +1996,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 9ad7ef2..34ec3c7 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1457,7 +1457,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; @@ -1668,7 +1668,7 @@ Each element is a string (directory name) or nil (try default directory). By default the last element of this list is `exec-directory'. The last element is not always used, for example in shell completion -(`shell-dynamic-complete-command'). */); +\(`shell-dynamic-complete-command'). */); DEFVAR_LISP ("exec-suffixes", Vexec_suffixes, doc: /* List of suffixes to try to find executable file names. diff --git a/src/category.c b/src/category.c index 61502f8..39e4f93 100644 --- a/src/category.c +++ b/src/category.c @@ -462,7 +462,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 @@ -476,7 +476,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 ec618f3..e6926a9 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -533,7 +533,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 3450003..70f8e5b 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -106,7 +106,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 e591bed..7c8be8e 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 07f8724..333effd 100644 --- a/src/data.c +++ b/src/data.c @@ -1673,7 +1673,7 @@ 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 +\(The buffer-local value of VARIABLE starts out as the same value VARIABLE previously had. If VARIABLE was void, it remains void.) Return VARIABLE. diff --git a/src/dispnew.c b/src/dispnew.c index f834f35..4f33569 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5671,7 +5671,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 a9273f0..a5ce326 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 bd70f0a..7c26d24 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1895,7 +1895,7 @@ DEFUN ("float-time", Ffloat_time, Sfloat_time, 0, 1, 0, doc: /* Return the current time, as a float number of seconds since the epoch. If SPECIFIED-TIME is given, it is the time to convert to float instead of the current time. The argument should have the form -(HIGH LOW) or (HIGH LOW USEC) or (HIGH LOW USEC PSEC). Thus, +\(HIGH LOW) or (HIGH LOW USEC) or (HIGH LOW USEC PSEC). Thus, you can use times from `current-time' and from `file-attributes'. SPECIFIED-TIME can also have the form (HIGH . LOW), but this is considered obsolete. @@ -2284,7 +2284,7 @@ OFFSET is an integer number of seconds ahead of UTC (east of Greenwich). NAME is a string giving the name of the time zone. If SPECIFIED-TIME is given, the time zone offset is determined from it instead of using the current time. The argument should have the form -(HIGH LOW . IGNORED). Thus, you can use times obtained from +\(HIGH LOW . IGNORED). Thus, you can use times obtained from `current-time' and from `file-attributes'. SPECIFIED-TIME can also have the form (HIGH . LOW), but this is considered obsolete. Optional second arg ZONE is omitted or nil for the local time zone, or @@ -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 26104a5..ba1ce74 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1191,7 +1191,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. @@ -2409,7 +2409,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 0372f46..c18524c 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -450,7 +450,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-as-directory FILENAME). +\(file-name-as-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 @@ -741,7 +741,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. @@ -757,7 +757,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 @@ -775,8 +775,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) { @@ -1459,7 +1459,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\ @@ -2468,7 +2468,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) { @@ -5329,8 +5329,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 cf485b6..cf1dee3 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 @@ -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 86ad333..571bfbe 100644 --- a/src/fns.c +++ b/src/fns.c @@ -216,7 +216,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. @@ -339,7 +339,7 @@ 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) +\(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 @@ -385,7 +385,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 @@ -1018,7 +1018,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) { @@ -1217,14 +1217,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) @@ -2044,7 +2044,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) @@ -2079,7 +2079,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. @@ -2123,7 +2123,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) @@ -2148,7 +2148,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. @@ -2861,7 +2861,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 039493b..55f0a03 100644 --- a/src/font.c +++ b/src/font.c @@ -4086,7 +4086,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 @@ -5378,7 +5378,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 4f61332..e013314 100644 --- a/src/frame.c +++ b/src/frame.c @@ -5228,7 +5228,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/fringe.c b/src/fringe.c index 597c666..25cc142 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1701,7 +1701,7 @@ syms_of_fringe (void) DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe, doc: /* Non-nil means that newline may flow into the right fringe. This means that display lines which are exactly as wide as the window -(not counting the final newline) will only occupy one screen line, by +\(not counting the final newline) will only occupy one screen line, by showing (or hiding) the final newline in the right fringe; when point is at the final newline, the cursor is shown in the right fringe. If nil, also continue lines which are exactly as wide as the window. */); diff --git a/src/inotify.c b/src/inotify.c index e0619e5..34d2aeb 100644 --- a/src/inotify.c +++ b/src/inotify.c @@ -272,7 +272,7 @@ onlydir Watching a directory is not recursive. CALLBACK is passed a single argument EVENT which contains an event structure of the format -(WATCH-DESCRIPTOR ASPECTS NAME COOKIE) +\(WATCH-DESCRIPTOR ASPECTS NAME COOKIE) WATCH-DESCRIPTOR is the same object that was returned by this function. It can be tested for equality using `equal'. ASPECTS describes the event. It is a diff --git a/src/keyboard.c b/src/keyboard.c index 298ab64..2d225c8 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11381,7 +11381,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, @@ -11595,7 +11595,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 7928e62..3044cfa 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. */) @@ -2493,7 +2493,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. @@ -2724,7 +2724,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/kqueue.c b/src/kqueue.c index a69d06d..5131aa0 100644 --- a/src/kqueue.c +++ b/src/kqueue.c @@ -67,9 +67,8 @@ kqueue_directory_listing (Lisp_Object directory_files) /* Generate a file notification event. */ static void -kqueue_generate_event -(Lisp_Object watch_object, Lisp_Object actions, - Lisp_Object file, Lisp_Object file1) +kqueue_generate_event (Lisp_Object watch_object, Lisp_Object actions, + Lisp_Object file, Lisp_Object file1) { Lisp_Object flags, action, entry; struct input_event event; @@ -109,8 +108,7 @@ kqueue_generate_event replaced by the new directory listing at the end of this function. */ static void -kqueue_compare_dir_list -(Lisp_Object watch_object) +kqueue_compare_dir_list (Lisp_Object watch_object) { Lisp_Object dir, pending_dl, deleted_dl; Lisp_Object old_directory_files, old_dl, new_directory_files, new_dl, dl; diff --git a/src/lread.c b/src/lread.c index 25e3ff0..5a36537 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2059,7 +2059,7 @@ Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX). FINAL-STRING-INDEX is an integer giving the position of the next remaining character in STRING. START and END optionally delimit a substring of STRING from which to read; they default to 0 and -(length STRING) respectively. Negative values are counted from +\(length STRING) respectively. Negative values are counted from the end of STRING. */) (Lisp_Object string, Lisp_Object start, Lisp_Object end) { diff --git a/src/menu.c b/src/menu.c index cbddef3..8e5bf4d 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1130,7 +1130,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. @@ -1495,7 +1495,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 180668f..06e5f82 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -986,7 +986,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 eda94c4..b98b510 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1684,7 +1684,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). @@ -1730,7 +1730,7 @@ If omitted or nil, that stands for the selected frame's display. Note: "screen" here is not in Nextstep terminology but in X11's. For the number of physical monitors, use `(length -(display-monitor-attributes-list TERMINAL))' instead. */) +\(display-monitor-attributes-list TERMINAL))' instead. */) (Lisp_Object terminal) { check_ns_display_info (terminal); @@ -1861,7 +1861,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; @@ -2301,7 +2301,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 463f02b..b7629d5 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/nsterm.h b/src/nsterm.h index fa5399c..8292c07 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -1044,10 +1044,10 @@ struct x_output /* Difference btwn char-column-calculated and actual SB widths. This is only a concern for rendering when SB on left. */ -#define NS_SCROLL_BAR_ADJUST(w, f) \ -(WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w) ? \ - (FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f) \ - - NS_SCROLL_BAR_WIDTH (f)) : 0) +#define NS_SCROLL_BAR_ADJUST(w, f) \ + (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w) ? \ + (FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f) \ + - NS_SCROLL_BAR_WIDTH (f)) : 0) /* Difference btwn char-line-calculated and actual SB heights. This is only a concern for rendering when SB on top. */ diff --git a/src/print.c b/src/print.c index 2ecc0f5..478842c 100644 --- a/src/print.c +++ b/src/print.c @@ -2224,7 +2224,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. */); @@ -2232,7 +2232,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 1eac5e1..f9a99d4 100644 --- a/src/process.c +++ b/src/process.c @@ -953,7 +953,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); @@ -2670,7 +2670,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 @@ -2678,12 +2678,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) @@ -2777,13 +2777,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) diff --git a/src/textprop.c b/src/textprop.c index 70091b9..104d89b 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1493,7 +1493,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/unexw32.c b/src/unexw32.c index 460a39e..0a7292a 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -34,11 +34,10 @@ along with GNU Emacs. If not, see . */ /* Include relevant definitions from IMAGEHLP.H, which can be found in \\win32sdk\mstools\samples\image\include\imagehlp.h. */ -PIMAGE_NT_HEADERS -(__stdcall * pfnCheckSumMappedFile) (LPVOID BaseAddress, - DWORD FileLength, - LPDWORD HeaderSum, - LPDWORD CheckSum); +PIMAGE_NT_HEADERS (__stdcall * pfnCheckSumMappedFile) (LPVOID BaseAddress, + DWORD FileLength, + LPDWORD HeaderSum, + LPDWORD CheckSum); extern BOOL ctrl_c_handler (unsigned long type); diff --git a/src/w16select.c b/src/w16select.c index 48bb813..0cd1b23 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 a5018ae..f4526e4 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5207,7 +5207,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; @@ -5349,7 +5349,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 @@ -5751,7 +5751,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; @@ -8090,7 +8090,7 @@ DEFUN ("w32-set-mouse-absolute-pixel-position", Fw32_set_mouse_absolute_pixel_po Sw32_set_mouse_absolute_pixel_position, 2, 2, 0, doc: /* Move mouse pointer to absolute pixel position (X, Y). The coordinates X and Y are interpreted in pixels relative to a position -(0, 0) of the selected frame's display. */) +\(0, 0) of the selected frame's display. */) (Lisp_Object x, Lisp_Object y) { UINT trail_num = 0; diff --git a/src/w32heap.c b/src/w32heap.c index b908169..df2fe0a 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -73,12 +73,11 @@ typedef PVOID (WINAPI * RtlCreateHeap_Proc) ( typedef LONG NTSTATUS; -typedef NTSTATUS -(NTAPI * PRTL_HEAP_COMMIT_ROUTINE)( - IN PVOID Base, - IN OUT PVOID *CommitAddress, - IN OUT PSIZE_T CommitSize - ); +typedef NTSTATUS (NTAPI *PRTL_HEAP_COMMIT_ROUTINE) ( + IN PVOID Base, + IN OUT PVOID *CommitAddress, + IN OUT PSIZE_T CommitSize + ); typedef struct _RTL_HEAP_PARAMETERS { ULONG Length; diff --git a/src/window.c b/src/window.c index 8953d3c..a15eb2f 100644 --- a/src/window.c +++ b/src/window.c @@ -670,7 +670,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) { @@ -1324,7 +1324,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. @@ -1710,7 +1710,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 dec9947..217203b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -31425,7 +31425,7 @@ 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 @@ -31433,10 +31433,10 @@ 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, diff --git a/src/xfaces.c b/src/xfaces.c index 7762e0f..0104857 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -701,10 +701,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; @@ -6536,7 +6536,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 20ac627..dced887 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3670,7 +3670,7 @@ 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.) */) +\(Note that the Nextstep version of this function ignores FRAME.) */) (Lisp_Object color, Lisp_Object frame) { XColor foo; @@ -3837,7 +3837,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. @@ -4759,7 +4759,7 @@ DEFUN ("x-set-mouse-absolute-pixel-position", Fx_set_mouse_absolute_pixel_positi Sx_set_mouse_absolute_pixel_position, 2, 2, 0, doc: /* Move mouse pointer to absolute pixel position (X, Y). The coordinates X and Y are interpreted in pixels relative to a position -(0, 0) of the selected frame's display. */) +\(0, 0) of the selected frame's display. */) (Lisp_Object x, Lisp_Object y) { struct frame *f = SELECTED_FRAME (); @@ -4935,7 +4935,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 23b735e..cbc44a1 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1911,7 +1911,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. @@ -1940,7 +1940,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 @@ -2044,7 +2044,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'. @@ -2620,7 +2620,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, @@ -2629,10 +2629,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, diff --git a/src/xwidget.c b/src/xwidget.c index f436e95..e8f3f29 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -387,9 +387,12 @@ webkit_download_cb (WebKitWebView *webkitwebview, } static gboolean -webkit_mime_type_policy_typedecision_requested_cb -(WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request, - gchar *mimetype, WebKitWebPolicyDecision *policy_decision, gpointer user_data) +webkit_mime_type_policy_typedecision_requested_cb (WebKitWebView *webView, + WebKitWebFrame *frame, + WebKitNetworkRequest *request, + gchar *mimetype, + WebKitWebPolicyDecision *policy_decision, + gpointer user_data) { /* This function makes webkit send a download signal for all unknown mime types. TODO: Defer the decision to Lisp, so that it's @@ -404,10 +407,12 @@ webkit_mime_type_policy_typedecision_requested_cb } static gboolean -webkit_new_window_policy_decision_requested_cb -(WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request, - WebKitWebNavigationAction *navigation_action, - WebKitWebPolicyDecision *policy_decision, gpointer user_data) +webkit_new_window_policy_decision_requested_cb (WebKitWebView *webView, + WebKitWebFrame *frame, + WebKitNetworkRequest *request, + WebKitWebNavigationAction *navigation_action, + WebKitWebPolicyDecision *policy_decision, + gpointer user_data) { struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET); webkit_web_navigation_action_get_original_uri (navigation_action); @@ -419,10 +424,12 @@ webkit_new_window_policy_decision_requested_cb } static gboolean -webkit_navigation_policy_decision_requested_cb -(WebKitWebView *webView, WebKitWebFrame *frame, WebKitNetworkRequest *request, - WebKitWebNavigationAction *navigation_action, - WebKitWebPolicyDecision *policy_decision, gpointer user_data) +webkit_navigation_policy_decision_requested_cb (WebKitWebView *webView, + WebKitWebFrame *frame, + WebKitNetworkRequest *request, + WebKitWebNavigationAction *navigation_action, + WebKitWebPolicyDecision *policy_decision, + gpointer user_data) { struct xwidget *xw = g_object_get_data (G_OBJECT (webView), XG_XWIDGET); store_xwidget_event_string (xw, "navigation-policy-decision-requested", --------------070905070406070408070902--