Commit 0756b0c3 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge trunk

parents 9ac0394b 68cbc58b
2011-11-07 Juanma Barranquero <>
* unidata/makefile.w32-in (clean): Remove bidimirror.h and biditype.h.
2011-10-31 David Engster <>
* grammars/bovine-grammar.el: Avoid using old-style backquotes.
......@@ -514,7 +514,7 @@
045B S-0791 # CYRILLIC SMALL LETTER TSHE (Serbocroatian)
045E S-0793 # CYRILLIC SMALL LETTER SHORT U (Byalorussian)
045E S-0793 # CYRILLIC SMALL LETTER SHORT U (Byelorussian)
2010 0-0130 1-0130 2-0130 # HYPHEN
2014 0-0129 1-0129 2-0129 # EM DASH
......@@ -52,5 +52,5 @@ charprop-CMD: unidata-gen.elc unidata.txt
${DSTDIR}/charprop.el: charprop-$(SHELLTYPE)
- $(DEL) unidata-gen.elc unidata.txt biditype.h bidimirror.h
- $(DEL) unidata-gen.elc unidata.txt
2011-11-10 Glenn Morris <>
* buffers.texi (Read Only Buffers): Expand a bit on why
toggle-read-only should only be used interactively. (Bug#7292)
2011-11-09 Chong Yidong <>
* windows.texi (Window Sizes): Document window-pixel-edges,
window-inside-pixel-edges, window-absolute-pixel-edges, and
(Resizing Windows): shrink-window-if-larger-than-buffer works on
non-full-width windows.
2011-11-09 Martin Rudalics <>
* windows.texi (Resizing Windows): Rewrite documentation of
2011-11-09 Chong Yidong <>
* windows.texi (Splitting Windows): Simplify example.
2011-11-08 Chong Yidong <>
* windows.texi (Window Sizes): Copyedits. Document
window-text-height. Remove window-min-height and window-min-width
discussion, referring instead to Emacs manual.
(Splitting Windows, Resizing Windows): Add xref to Emacs manual.
(Resizing Windows): Simplify introduction. Don't document
enlarge-window, shrink-window, enlarge-window-horizontally, and
shrink-window-horizontally; they are no longer preferred for
calling from Lisp, and are already documented in the Emacs manual.
2011-11-07 Glenn Morris <>
* windows.texi (Choosing Window): Fix keybinding typo.
2011-11-07 Martin Rudalics <>
* windows.texi (Resizing Windows, Splitting Windows)
(Window Configurations): Use "child window" instead of
2011-11-06 Chong Yidong <>
* windows.texi (Basic Windows): Clarify various definitions.
......@@ -1064,9 +1107,9 @@
* commands.texi (Misc Events): Add cross-references to where
POSITION of a mouse event is described in detail.
2010-08-08 Christoph <>
2010-08-08 Christoph Scholtes <>
* control.texi (Handling Errors) <error-message-string>: Fix arg name.
* control.texi (Handling Errors) <error-message-string>: Fix arg name.
2010-08-08 Juanma Barranquero <>
......@@ -748,10 +748,11 @@ of the list (comparison is done with @code{eq}).
@deffn Command toggle-read-only &optional arg
This command toggles whether the current buffer is read-only. It is
intended for interactive use; do not use it in programs. At any given
point in a program, you should know whether you want the read-only flag
on or off; so you can set @code{buffer-read-only} explicitly to the
proper value, @code{t} or @code{nil}.
intended for interactive use; do not use it in programs (it may have
side-effects, such as enabling View mode, and does not affect
read-only text properties). To change the read-only state of a buffer in
a program, explicitly set @code{buffer-read-only} to the proper value.
To temporarily ignore a read-only state, bind @code{inhibit-read-only}.
If @var{arg} is non-@code{nil}, it should be a raw prefix argument.
@code{toggle-read-only} sets @code{buffer-read-only} to @code{t} if
This diff is collapsed.
......@@ -64,13 +64,13 @@ It is a way for multiple applications to share a single configuration
* Overview:: Overview of the auth-source library.
* Help for users::
* Secret Service API::
* Help for developers::
* GnuPG and EasyPG Assistant Configuration::
* Index::
* Function Index::
* Variable Index::
* Help for users::
* Secret Service API::
* Help for developers::
* GnuPG and EasyPG Assistant Configuration::
* Index::
* Function Index::
* Variable Index::
@end menu
@end ifnottex
......@@ -182,7 +182,7 @@ Here's a mixed example using two sources:
If you don't customize @code{auth-sources}, you'll have to live with
the defaults: any host and any port are looked up in the netrc
file @code{~/.authinfo.gpg}, which is a GnuPG encrypted file
(@pxref{GnuPG and EasyPG Assistant Configuration}).
(@pxref{GnuPG and EasyPG Assistant Configuration}).
If that fails, the unencrypted netrc files @code{~/.authinfo} and
@code{~/.netrc} will be used.
......@@ -340,7 +340,7 @@ If you are using earlier versions of Emacs, you will need:
@end lisp
If you want your GnuPG passwords to be cached, set up @code{gpg-agent}
or EasyPG Assitant
or EasyPG Assistant
(@pxref{Caching Passphrases, , Caching Passphrases, epa}).
To quick start, here are some questions:
......@@ -1001,7 +1001,7 @@ press @kbd{^} from the Group buffer to see it. In the Server buffer,
you can press @kbd{RET} on a defined server to see all the groups it
serves (subscribed or not!). You can also add or delete servers, edit
a foreign server's definition, agentize or de-agentize a server, and
do many other neat things. @xref{Server Buffer}.
do many other neat things. @xref{Server Buffer}.
@xref{Foreign Groups}. @xref{Agent Basics}.
@vindex gnus-select-method
......@@ -11805,7 +11805,7 @@ fit these criteria.
To use this, make sure that you have @code{w3m} and @code{curl}
installed. If you have, then Gnus should display @acronym{HTML}
......@@ -21078,8 +21078,8 @@ as well.
This chapter describes tools for searching groups and servers for
articles matching a query and then retrieving those articles. Gnus
provides a simpler mechanism for searching through articles in a summary buffer
to find those matching a pattern. @xref{Searching for Articles}.
provides a simpler mechanism for searching through articles in a summary buffer
to find those matching a pattern. @xref{Searching for Articles}.
* nnir:: Searching with various engines.
......@@ -21110,7 +21110,7 @@ interface.
The @code{nnimap} and @code{gmane} search engines should work with no
configuration. Other engines require a local index that needs to be
created and maintained outside of Gnus.
created and maintained outside of Gnus.
@node Basic Usage
......@@ -21150,7 +21150,7 @@ One more thing: individual search engines may have special search
features. You can access these special features by giving a prefix-arg
to @code{gnus-group-make-nnir-group}. If you are searching multiple
groups with different search engines you will be prompted for the
special search features for each engine separately.
special search features for each engine separately.
@node Setting up nnir
......@@ -21191,7 +21191,7 @@ named @code{home} you can use
(setq gnus-secondary-select-methods
'((nnml "home"
'((nnml "home"
(nnimap-address "localhost")
(nnir-search-engine namazu))))
@end lisp
......@@ -21216,9 +21216,9 @@ could change this to
@node The imap Engine
@subsubsection The imap Engine
The @code{imap} engine requires no configuration.
The @code{imap} engine requires no configuration.
Queries using the @code{imap} engine follow a simple query language.
Queries using the @code{imap} engine follow a simple query language.
The search is always case-insensitive and supports the following
features (inspired by the Google search input language):
......@@ -21231,7 +21231,7 @@ operators must be written with all capital letters to be
recognised. Also preceding a term with a - sign is equivalent to NOT
@item Automatic AND queries
@item Automatic AND queries
If you specify multiple words then they will be treated as an AND
expression intended to match all components.
......@@ -21264,7 +21264,7 @@ customize @code{nnir-imap-default-search-key}. For example to use
@node The gmane Engine
@subsubsection The gmane Engine
The @code{gmane} engine requires no configuration.
The @code{gmane} engine requires no configuration.
Gmane queries follow a simple query language:
......@@ -21278,11 +21278,11 @@ recognised.
@item Required and excluded terms
+ and - can be used to require or exclude terms, e.g. football -american
@item Unicode handling
@item Unicode handling
The search engine converts all text to utf-8, so searching should work
in any language.
@item Stopwords
@item Stopwords
Common English words (like 'the' and 'a') are ignored by default. You
can override this by prefixing such words with a + (e.g. +the) or
enclosing the word in quotes (e.g. "the").
......@@ -21345,7 +21345,7 @@ to get a group name. By default this is @code{$HOME/Mail}.
Using the namazu engine requires creating and maintaining index files.
One directory should contain all the index files, and nnir must be told
where to find them by setting the @code{nnir-namazu-index-directory}
To work correctly the @code{nnir-namazu-remove-prefix} variable must
also be correct. This is the prefix to remove from each file name
......@@ -21408,7 +21408,7 @@ this command periodically, say every four hours.
This engine is obsolete.
@node Customizations
@subsubsection Custimozations
@subsubsection Customizations
@table @code
......@@ -621,6 +621,10 @@ view-diary-entries, list-diary-entries, show-all-diary-entries
inserted by the compilation filter function, when calling
*** `compilation-error-screen-columns' is obeyed in the editing buffer.
So programming language modes can set it, whereas previously only the value
in the *compilation* buffer was used.
** Customize
*** Customize buffers now contain a search field.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -451,7 +451,7 @@ displays them, incorrectly, as separate from the modified glyphs.")
;; them, and the recipient's client is capable, they will get through,
;; though.
("_\"" "̈") ;; Centralised U+0308
("_\"" "̈") ;; Centralized U+0308
("_+" "̟") ;; Advanced U+031F
("_-" "̠") ;; Retracted U+0320
("_/" "ˇ") ;; Rising tone U+02C7
2011-11-11 Glenn Morris <>
* subr.el (eval-after-load): If FILE is already loaded,
evaluate FORM before it gets wrapped in more stuff. (Bug#10009)
2011-11-10 Glenn Morris <>
* vc/vc-svn.el (vc-svn-create-repo, vc-svn-modify-change-comment):
Call svn via vc-svn-command rather than vc-do-command.
(vc-svn-command): Add --non-interactive. (Bug#9993)
(vc-svn-update, vc-svn-merge-news): No need for --non-interactive.
* emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Add toggle-read-only. (Bug#7292)
* files.el (toggle-read-only): Mention that it should only
be used interactively. (Bug#10006)
2011-11-09 Stefan Monnier <>
* progmodes/compile.el (compilation-error-regexp-alist-alist):
Adjust regexp for OCaml warnings.
* electric.el (electric-pair-post-self-insert-function): Let user
turn it off buffer-locally (bug#9932).
* progmodes/python.el (python-beginning-of-statement):
Rewrite (bug#2703).
* progmodes/compile.el: Better handle TABs (bug#9749).
(compilation-next-error-function): Obey the target buffer's
2011-11-09 Juanma Barranquero <>
* progmodes/meta-mode.el: Remove obsolete comments.
(meta-right-comment-regexp, meta-ignore-comment-regexp):
Fix typos in docstrings.
2011-11-09 Martin Rudalics <>
* window.el (window-size-fixed-p): Rewrite doc-string.
(window-resizable-p): Rename to window--resizable-p. Update callers.
(window--resizable): New function. Make all callers of
window-resizable call window--resizable instead.
(window-resizable): Rewrite in terms of window--resizable.
2011-11-08 Glenn Morris <>
* progmodes/delphi.el (delphi-mode-syntax-table):
Let define-derived-mode define a proper syntax table. (Bug#9994)
2011-11-08 Stefan Monnier <>
* window.el: Stay away from defsubst.
(window-list-no-nils): Remove.
(window-state-get-1, window-state-get): Use backquote instead.
2011-11-08 thierry <>
* emacs-lisp/find-func.el (find-function-read):
Fix incorrect use of default argument in `completing-read'.
2011-11-08 Martin Rudalics <>
* window.el (display-buffer-function, special-display-function):
Mention display-buffer-record-window but do not mention
help-setup parameter in doc-strings.
(window-min-delta): Fix doc-string typo.
2011-11-08 Chong Yidong <>
* window.el (window-total-height, window-total-width): Doc fix.
(window-body-size): Move from C.
(window-body-height, window-body-width): Move to C.
2011-11-08 Stefan Monnier <>
* window.el: Make special-display like display-buffer-alist (bug#9532).
(display-buffer--special-action): New function, morphed
from display-buffer--special.
(display-buffer): Use it to handle special-display-buffers at higher
priority (just after display-buffer-alist).
(display-buffer-fallback-action, display-buffer--other-frame-action)
(pop-to-buffer-same-window): Remove display-buffer--special.
2011-11-07 Glenn Morris <>
* calendar/cal-menu.el (cal-menu-set-date-title):
Do nothing if not in a calendar. (Bug#9976)
2011-11-07 Stefan Monnier <>
* files.el (find-file): Always use selected-window.
2011-11-07 Martin Rudalics <>
* window.el (window-combinations): Make WINDOW argument
mandatory. Rewrite doc-string.
(walk-window-subtree, window-atom-check, window-min-delta)
(window-max-delta, window--resize-this-window)
(window--resize-root-window-vertically, window-tree)
(balance-windows, window-state-put): Rewrite doc-strings as to
not mention the term "subwindow".
(window--resize-subwindows-skip-p): Rename to
(window--resize-subwindows-normal): Rename to
(window--resize-subwindows): Rename to
(window-or-subwindow-p): Rename to window--in-subtree-p.
2011-11-07 Mark Lillibridge <> (tiny change)
* mail/rmail.el (rmail-get-new-mail, rmail-insert-inbox-text):
Ensure that mbox format messages end in two newlines (Bug#9974).
2011-11-06 Chong Yidong <>
* window.el (window-combination-p): Function deleted; its
......@@ -11,7 +128,7 @@
(window-size-ignore, window-state-get): Callers changed.
(window-normalize-window): Rename from window-normalize-any-window.
New arg LIVE-ONLY, replacing window-normalize-live-window.
(window-normalize-live-window): Deleted.
(window-normalize-live-window): Delete.
(window-combination-p, window-combined-p, window-combinations)
(walk-window-subtree, window-atom-root, window-min-size)
(window-sizable, window-sizable-p, window-size-fixed-p)
......@@ -215,13 +215,15 @@ is non-nil."
;; but easymenu does not seem to allow this (?).
;; The ignore-errors is because `documentation' can end up calling
;; this in a non-calendar buffer where displayed-month is unbound. (Bug#3862)
;; This still has issues - bug#9976, so added derived-mode-p call.
(defun cal-menu-set-date-title (menu)
"Convert date of last event to title suitable for MENU."
(let ((date (ignore-errors (calendar-cursor-to-date nil last-input-event))))
(if date
(easy-menu-filter-return menu (calendar-date-string date t nil))
(message "Not on a date!")
(when (derived-mode-p 'calendar-mode)
(let ((date (ignore-errors (calendar-cursor-to-date nil last-input-event))))
(if date
(easy-menu-filter-return menu (calendar-date-string date t nil))
(message "Not on a date!")
(easy-menu-define cal-menu-context-mouse-menu nil
"Pop up mouse menu for selected date in the calendar window."
......@@ -194,7 +194,7 @@ Any other value is treated as t."
:tag "Column Formating"
(const :tag "No Formating" nil)
(const :tag "Column Alignment" t)
(const :tag "Separator Aligment" separator)
(const :tag "Separator Alignment" separator)
(const :tag "Column Padding" padding))
:group 'columns)
......@@ -284,6 +284,7 @@ This can be convenient for people who find it easier to hit ) than C-f."
(defun electric-pair-post-self-insert-function ()
(let* ((syntax (and (eq (char-before) last-command-event) ; Sanity check.
(let ((x (assq last-command-event electric-pair-pairs)))
(x (if (eq (car x) (cdr x)) ?\" ?\())
......@@ -355,7 +355,7 @@ else the global value will be modified."
(defvar byte-compile-interactive-only-functions
'(beginning-of-buffer end-of-buffer replace-string replace-regexp
insert-file insert-buffer insert-file-literally previous-line next-line
goto-line comint-run delete-backward-char)
goto-line comint-run delete-backward-char toggle-read-only)
"List of commands that are not meant to be called from Lisp.")
(defvar byte-compile-not-obsolete-vars nil
......@@ -363,29 +363,23 @@ If TYPE is nil, insist on a symbol with a function definition.
Otherwise TYPE should be `defvar' or `defface'.
If TYPE is nil, defaults using `function-called-at-point',
otherwise uses `variable-at-point'."
(let ((symb (if (null type)
(if (eq type 'defvar)
(variable-at-point t))))
(predicate (cdr (assq type '((nil . fboundp) (defvar . boundp)
(defface . facep)))))
(prompt (cdr (assq type '((nil . "function") (defvar . "variable")
(defface . "face")))))
(enable-recursive-minibuffers t)
(if (equal symb 0)
(setq symb nil))
(setq val (completing-read
(concat "Find "
(if symb
(format " (default %s)" symb))
": ")
obarray predicate t nil))
(list (if (equal val "")
(intern val)))))
(let* ((symb1 (cond ((null type) (function-called-at-point))
((eq type 'defvar) (variable-at-point))
(t (variable-at-point t))))
(symb (unless (eq symb1 0) symb1))
(predicate (cdr (assq type '((nil . fboundp)
(defvar . boundp)
(defface . facep)))))
(prompt-type (cdr (assq type '((nil . "function")
(defvar . "variable")
(defface . "face")))))
(prompt (concat "Find " prompt-type
(and symb (format " (default %s)" symb))
": "))
(enable-recursive-minibuffers t))
(list (intern (completing-read
prompt obarray predicate
t nil nil (and symb (symbol-name symb)))))))
(defun find-function-do-it (symbol type switch-fn)
"Find Emacs Lisp SYMBOL in a buffer and display it.
......@@ -2484,7 +2484,7 @@ Argument GOLD-BINDING is the Emacs function to be bound to GOLD <KEY>."
F10: Cut Rectangle
G-F10: Paste Rectangle
F11: ESC
F12: Begining of Line +----------+----------+----------+----------+
F12: Beginning of Line +----------+----------+----------+----------+
G-F12: Delete Other Windows | GOLD | HELP | FNDNXT | DEL L |
F13: Delete to Begin of Word | (PF1) | (PF2) | (PF3) | (PF4) |
HELP: Keypad Help |Mark Wisel|Desc Funct| FIND | UND L |
......@@ -1343,7 +1343,7 @@ automatically choosing a major mode, use \\[find-file-literally]."
(let ((value (find-file-noselect filename nil nil wildcards)))
(if (listp value)
(mapcar 'switch-to-buffer (nreverse value))
(switch-to-buffer value))))
(switch-to-buffer value nil 'force-same-window))))
(defun find-file-other-window (filename &optional wildcards)
"Edit file FILENAME, in another window.
......@@ -4686,7 +4686,15 @@ prints a message in the minibuffer. Instead, use `set-buffer-modified-p'."
"Change whether this buffer is read-only.
With prefix argument ARG, make the buffer read-only if ARG is
positive, otherwise make it writable. If buffer is read-only
and `view-read-only' is non-nil, enter view mode."
and `view-read-only' is non-nil, enter view mode.
This function is usually the wrong thing to use in a Lisp program.
It can have side-effects beyond changing the read-only status of a buffer
\(e.g., enabling view mode), and does not affect read-only regions that
are caused by text properties. To make a buffer read-only in Lisp code,
set `buffer-read-only'. To ignore read-only status (whether due to text
properties or buffer state) and make changes, temporarily bind
(interactive "P")
(if (and arg
(if (> (prefix-numeric-value arg) 0) buffer-read-only
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment