diff options
| -rw-r--r-- | doc/lispref/modes.texi | 59 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 23 | ||||
| -rw-r--r-- | doc/lispref/tips.texi | 13 | ||||
| -rw-r--r-- | doc/misc/eww.texi | 2 | ||||
| -rw-r--r-- | etc/PROBLEMS | 4 | ||||
| -rw-r--r-- | lisp/calendar/time-date.el | 1 | ||||
| -rw-r--r-- | lisp/international/ucs-normalize.el | 2 | ||||
| -rw-r--r-- | lisp/net/eww.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 7 | ||||
| -rw-r--r-- | src/callproc.c | 5 | ||||
| -rw-r--r-- | src/coding.h | 2 | ||||
| -rw-r--r-- | src/process.c | 2 |
12 files changed, 106 insertions, 16 deletions
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 143cc7c5827..6349dec98b8 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1121,6 +1121,65 @@ that tags placed via @code{tabulated-list-put-tag} will not be removed from entries that haven't changed (normally all tags are removed). @end defun +@defun tabulated-list-delete-entry +This function deletes the entry at point. + +It returns a list @code{(@var{id} @var{cols})}, where @var{id} is the +ID of the deleted entry and @var{cols} is a vector of its column +descriptors. It moves point to the beginning of the current line. It +returns @code{nil} if there is no entry at point. + +Note that this function only changes the buffer contents; it does not +alter @code{tabulated-list-entries}. +@end defun + +@defun tabulated-list-get-id &optional pos +This @code{defsubst} returns the ID object from +@code{tabulated-list-entries} (if that is a list) or from the list +returned by @code{tabulated-list-entries} (if it is a function). If +omitted or @code{nil}, @var{pos} defaults to point. +@end defun + +@defun tabulated-list-get-entry &optional pos +This @code{defsubst} returns the entry object from +@code{tabulated-list-entries} (if that is a list) or from the list +returned by @code{tabulated-list-entries} (if it is a function). This +will be a vector for the ID at @var{pos}. If there is no entry at +@var{pos}, then the function returns @code{nil}. +@end defun + +@vindex tabulated-list-use-header-line +@defun tabulated-list-header-overlay-p &optional POS +This @code{defsubst} returns non-nil if there is a fake header at +@var{pos}. A fake header is used if +@code{tabulated-list-use-header-line} is @code{nil} to put the column +names at the beginning of the buffer. If omitted or @code{nil}, +@var{pos} defaults to @code{point-min}. +@end defun + +@vindex tabulated-list-padding +@defun tabulated-list-put-tag tag &optional advance +This function puts @var{tag} in the padding area of the current line. +The padding area can be empty space at the beginning of the line, the +width of which is governed by @code{tabulated-list-padding}. +@var{tag} should be a string, with a length less than or equal to +@code{tabulated-list-padding}. If @var{advance} is non-nil, this +function advances point by one line. +@end defun + +@defun tabulated-list-set-col col desc &optional change-entry-data +This function changes the tabulated list entry at point, setting +@var{col} to @var{desc}. @var{col} is the column number to change, or +the name of the column to change. @var{desc} is the new column +descriptor, which is inserted via @code{tabulated-list-print-col}. + +If @var{change-entry-data} is non-nil, this function modifies the +underlying data (usually the column descriptor in the list +@code{tabulated-list-entries}) by setting the column descriptor of the +vector to @code{desc}. +@end defun + + @node Generic Modes @subsection Generic Modes @cindex generic mode diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 6fae93717a2..9766b8321fa 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1544,7 +1544,28 @@ Time values include @code{nil}, numbers, and Lisp timestamps @defun date-to-time string This function parses the time-string @var{string} and returns the -corresponding Lisp timestamp. +corresponding Lisp timestamp. The argument @var{string} should represent +a date-time, and should be in one of the forms recognized by +@code{parse-time-string} (see below). This function assumes the GMT +timezone if @var{string} lacks an explicit timezone information. +@end defun + +@defun parse-time-string string +This function parses the time-string @var{string} into a list of the +following form: + +@example +(@var{sec} @var{min} @var{hour} @var{day} @var{mon} @var{year} @var{dow} @var{dst} @var{tz}) +@end example + +@noindent +The format of this list is the same as what @code{decode-time} accepts +(@pxref{Time Conversion}), and is described in more detail there. Any +element that cannot be determined from the input will be set to +@code{nil}. The argument @var{string} should resemble an RFC 2822 or +ISO 8601 string, like ``Fri, 25 Mar 2016 16:24:56 +0100'' or +``1998-09-12T12:21:54-0200'', but this function will attempt to parse +less well-formed time strings as well. @end defun @defun format-time-string format-string &optional time zone diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index bb701c4930a..d41fe825729 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -679,10 +679,15 @@ starting double-quote is not part of the string! @cindex curly quotes @cindex curved quotes When a documentation string refers to a Lisp symbol, write it as it -would be printed (which usually means in lower case), surrounding -it with curved single quotes (@t{‘} and @t{’}). There are -two exceptions: write @code{t} and @code{nil} without surrounding -punctuation. For example: @samp{CODE can be ‘lambda’, nil, or t}. +would be printed (which usually means in lower case), surrounding it +with curved single quotes (@t{‘..’}). There are two exceptions: write +@code{t} and @code{nil} without surrounding punctuation. For example: + +@example + CODE can be ‘lambda’, nil, or t. +@end example + +@noindent @xref{Quotation Marks,,, emacs, The GNU Emacs Manual}, for how to enter curved single quotes. diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi index 3048893372e..d7dc32846e3 100644 --- a/doc/misc/eww.texi +++ b/doc/misc/eww.texi @@ -118,7 +118,7 @@ variable-pitch fonts or not. This sets the @code{shr-use-fonts} variable. @findex eww-toggle-colors @findex shr-use-colors @kindex F - The @kbd{C} command (@code{eww-toggle-colors}) toggles whether to use + The @kbd{M-C} command (@code{eww-toggle-colors}) toggles whether to use HTML-specified colors or not. This sets the @code{shr-use-colors} variable. @findex eww-download diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 7be0e34397c..785e6e18afa 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1836,8 +1836,8 @@ term/xterm.el) for more details. *** GNU/Linux: profiler-report outputs nothing. A few versions of the Linux kernel have timer bugs that break CPU -profiling; see Bug#34235. To fix the problem, upgrade to kernel -versions 4.19.19 or 4.20.6, or later. +profiling; see Bug#34235. To fix the problem, upgrade to one of the +kernel versions 4.14.97, 4.19.19, or 4.20.6, or later. *** GNU/Linux: Process output is corrupted. diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index 11ad92e7162..6fb0f22427a 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -148,6 +148,7 @@ it is assumed that PICO was omitted and should be treated as zero." ;; values. timezone-make-date-arpa-standard should help. (defun date-to-time (date) "Parse a string DATE that represents a date-time and return a time value. +DATE should be in one of the forms recognized by `parse-time-string'. If DATE lacks timezone information, GMT is assumed." (condition-case err (apply 'encode-time (parse-time-string date)) diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el index e212e14671e..9d55470d948 100644 --- a/lisp/international/ucs-normalize.el +++ b/lisp/international/ucs-normalize.el @@ -30,7 +30,7 @@ ;; ;; HFS-Normalization: ;; Reference: -;; http://developer.apple.com/technotes/tn/tn1150.html +;; https://developer.apple.com/library/archive/technotes/tn/tn1150.html ;; ;; HFS Normalization excludes following area for decomposition. ;; diff --git a/lisp/net/eww.el b/lisp/net/eww.el index a3f22aeb8a0..555b3bd5917 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1544,7 +1544,7 @@ Use link at point if there is one, else the current page's URL." (defun eww-download-callback (status url) (unless (plist-get status :error) (let* ((obj (url-generic-parse-url url)) - (path (car (url-path-and-query obj))) + (path (directory-file-name (car (url-path-and-query obj)))) (file (eww-make-unique-file-name (eww-decode-url-file-name (file-name-nondirectory path)) eww-download-directory))) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index e39d3d8b37c..a5c866d7503 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1996,10 +1996,13 @@ Saves the buffer to the file." (with-current-buffer filebuf (let ((failed t)) (unwind-protect - (let ((coding-system-for-read 'no-conversion) - (coding-system-for-write 'no-conversion)) + (let ((coding-system-for-read 'no-conversion)) (with-temp-file filename (let ((outbuf (current-buffer))) + ;; We will read the backend's output with no + ;; conversions, so we should also save the + ;; temporary file with no encoding conversions. + (setq buffer-file-coding-system 'no-conversion) ;; Change buffer to get local value of ;; vc-checkout-switches. (with-current-buffer filebuf diff --git a/src/callproc.c b/src/callproc.c index d4558387cfc..a3d09609d7b 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -237,7 +237,7 @@ DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case, t (mix it with ordinary output), or a file name string. Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted. -Remaining arguments are strings passed as command arguments to PROGRAM. +Remaining arguments ARGS are strings passed as command arguments to PROGRAM. If executable PROGRAM can't be found as an executable, `call-process' signals a Lisp error. `call-process' reports errors in execution of @@ -1033,7 +1033,8 @@ STDERR-FILE may be nil (discard standard error output), t (mix it with ordinary output), or a file name string. Sixth arg DISPLAY non-nil means redisplay buffer as output is inserted. -Remaining args are passed to PROGRAM at startup as command args. +Remaining arguments ARGS are passed to PROGRAM at startup as command-line +arguments. If BUFFER is 0, `call-process-region' returns immediately with value nil. Otherwise it waits for PROGRAM to terminate diff --git a/src/coding.h b/src/coding.h index 337ec46315e..58e12d6176a 100644 --- a/src/coding.h +++ b/src/coding.h @@ -450,7 +450,7 @@ struct coding_system unsigned char *safe_charsets; - /* How may heading bytes we can skip for decoding. This is set to + /* How many heading bytes we can skip for decoding. This is set to -1 in setup_coding_system, and updated by detect_coding. So, when this is equal to the byte length of the text being converted, we can skip the actual conversion process except for diff --git a/src/process.c b/src/process.c index 9502ef461e8..802ac026249 100644 --- a/src/process.c +++ b/src/process.c @@ -1360,7 +1360,7 @@ If THREAD is nil, the process is unlocked. */) DEFUN ("process-thread", Fprocess_thread, Sprocess_thread, 1, 1, 0, - doc: /* Ret the locking thread of PROCESS. + doc: /* Return the locking thread of PROCESS. If PROCESS is unlocked, this function returns nil. */) (Lisp_Object process) { |