diff options
author | Glenn Morris <rgm@gnu.org> | 2019-07-30 21:42:34 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-07-30 21:42:34 -0700 |
commit | 1ac0cfa2642ac026e09a7555f000e895b49289d5 (patch) | |
tree | 952416b5746614ea4e961dca70a00162421de36f /doc/lispref | |
parent | 77fb84e6db96cbaa70e230f4881e4ede6e028f15 (diff) | |
parent | 8fbe46252f5f241d274b59c6b1aaecd3ee58cc6a (diff) | |
download | emacs-1ac0cfa2642ac026e09a7555f000e895b49289d5.tar.gz emacs-1ac0cfa2642ac026e09a7555f000e895b49289d5.tar.bz2 emacs-1ac0cfa2642ac026e09a7555f000e895b49289d5.zip |
Merge from origin/emacs-26
8fbe462 (origin/emacs-26) ; * doc/lispref/positions.texi (List Motion...
1d9efc0 Add index for "\( in strings" (Bug#25195)
304e96f Fix doc-string of 'fit-window-to-buffer' (Bug#36848)
d4c4987 Update view-mode docstring
d6ca1fc ; * lisp/term.el: Add missing / to esc seq commentary.
b3e2073 Fix subproc listening when setting filter to non-t (Bug#36591)
f671950 * etc/NEWS.25: Belatedly announce rcirc-reconnect-delay.
7f42277 Mention term.el's \032 dir tracking in commentary (Bug#19524)
16a529e Remove upload functionality of package-x from the elisp manual
78e6c2a * etc/AUTHORS: Update.
086a56e Clarify Gravatar docs
0592467 * doc/lispref/display.texi (Defining Faces): Say a face can't...
# Conflicts:
# doc/emacs/programs.texi
# etc/AUTHORS
# lisp/term.el
Diffstat (limited to 'doc/lispref')
-rw-r--r-- | doc/lispref/display.texi | 5 | ||||
-rw-r--r-- | doc/lispref/package.texi | 35 | ||||
-rw-r--r-- | doc/lispref/positions.texi | 6 |
3 files changed, 10 insertions, 36 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index cf0008df86c..42f838bcdbf 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2523,6 +2523,11 @@ face name. In the vast majority of cases, this is not necessary; the usual procedure is to define a face with @code{defface}, and then use its name directly. +@cindex face (non-removability of) +Note that once you have defined a face (usually with @code{defface}), +you cannot later undefine this face safely, except by restarting +Emacs. + @defmac defface face spec doc [keyword value]@dots{} This macro declares @var{face} as a named face whose default face spec is given by @var{spec}. You should not quote the symbol @var{face}, diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index 7244efbd8f7..a2f4f55be7d 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -321,41 +321,6 @@ reachable via HTTP, this directory must be accessible to a web server; by default; type @kbd{M-x load-library @key{RET} package-x @key{RET}} to load it, or add @code{(require 'package-x)} to your init file. @xref{Lisp Libraries,, Lisp Libraries, emacs, The GNU Emacs Manual}. -Once loaded, you can make use of the following: - -@defopt package-archive-upload-base -The value of this variable is the base location of a package archive, -as a directory name. The commands in the @code{package-x} library -will use this base location. - -The directory name should be absolute. You may specify a remote name, -such as @file{/ssh:foo@@example.com:/var/www/packages/}, if the -package archive is on a different machine. @xref{Remote Files,, -Remote Files, emacs, The GNU Emacs Manual}. -@end defopt - -@deffn Command package-upload-file filename -This command prompts for @var{filename}, a file name, and uploads that -file to @code{package-archive-upload-base}. The file must be either a -simple package (a @file{.el} file) or a multi-file package (a -@file{.tar} file); otherwise, an error is raised. The package -attributes are automatically extracted, and the archive's contents -list is updated with this information. - -If @code{package-archive-upload-base} does not specify a valid -directory, the function prompts interactively for one. If the -directory does not exist, it is created. The directory need not have -any initial contents (i.e., you can use this command to populate an -initially empty archive). -@end deffn - -@deffn Command package-upload-buffer -This command is similar to @code{package-upload-file}, but instead of -prompting for a package file, it uploads the contents of the current -buffer. The current buffer must be visiting a simple package (a -@file{.el} file) or a multi-file package (a @file{.tar} file); -otherwise, an error is raised. -@end deffn @noindent After you create an archive, remember that it is not accessible in the diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 77077934673..cd9587ba4bd 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -794,11 +794,15 @@ on a line that starts with a match for this regular expression, followed by a character with open-parenthesis syntax. @end defopt +@cindex \( in strings @defopt open-paren-in-column-0-is-defun-start If this variable's value is non-@code{nil}, an open parenthesis in column 0 is considered to be the start of a defun. If it is @code{nil}, an open parenthesis in column 0 has no special meaning. -The default is @code{t}. +The default is @code{t}. If a string literal happens to have a +parenthesis in column 0, escape it with a backslash to avoid a false +positive. @xref{Left Margin Paren,, Left Margin Convention, emacs, +The GNU Emacs Manual}. @end defopt @defvar beginning-of-defun-function |