Merge from mainline.
This commit is contained in:
Paul Eggert
commit
8ff0ac3c78
21 changed files with 160 additions and 44 deletions
|
|
@ -931,7 +931,7 @@ dvi:
|
|||
|
||||
.PHONY: bootstrap
|
||||
|
||||
## configure; make boostrap replaces the real config.log from configure
|
||||
## configure; make bootstrap replaces the real config.log from configure
|
||||
## with the truncated one from config.status. The former is more useful.
|
||||
bootstrap: bootstrap-clean FRC
|
||||
if [ -x ./config.status ]; then \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2011-05-06 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* cal-xtra.texi (Fancy Diary Display): Mention diary comments.
|
||||
|
||||
2011-05-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* misc.texi (Emacs Server): Document `server-eval-at'.
|
||||
|
|
|
|||
|
|
@ -616,6 +616,20 @@ first within each day. Note how the sort command is placed at the end
|
|||
of the hook list, in case earlier members of the list change the order
|
||||
of the diary entries, or add items.
|
||||
|
||||
@vindex diary-comment-start
|
||||
You can write @samp{comments} in diary entries, by setting the
|
||||
variables @code{diary-comment-start} and @code{diary-comment-end} to
|
||||
strings that delimit comments. The fancy display does not print
|
||||
comments. You might want to put meta-data for the use of other packages
|
||||
(e.g. the appointment package,
|
||||
@iftex
|
||||
@pxref{Appointments,,,emacs, the Emacs Manual})
|
||||
@end iftex
|
||||
@ifnottex
|
||||
@pxref{Appointments})
|
||||
@end ifnottex
|
||||
inside comments.
|
||||
|
||||
@vindex diary-include-string
|
||||
Your main diary file can include other files. This permits a group of
|
||||
people to share a diary file for events that apply to all of them.
|
||||
|
|
|
|||
4
etc/NEWS
4
etc/NEWS
|
|
@ -447,6 +447,10 @@ You can get a comparable behavior with:
|
|||
|
||||
** Calendar, Diary, and Appt
|
||||
|
||||
+++
|
||||
*** Diary entries can contain non-printing `comments'.
|
||||
See the variable `diary-comment-start'.
|
||||
|
||||
*** New function `diary-hebrew-birthday'.
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,45 @@
|
|||
2011-05-05 Daniel Colascione <dan.colascione@gmail.com>
|
||||
2011-05-06 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
|
||||
correct match group (bug#8438).
|
||||
* calendar/diary-lib.el (diary-comment-start, diary-comment-end):
|
||||
New options.
|
||||
(diary-add-to-list): Strip comments from the displayed string.
|
||||
(diary-mode): Set comment-start and comment-end.
|
||||
|
||||
* vc/diff-mode.el (smerge-refine-subst): Declare.
|
||||
(diff-refine-hunk): Don't require smerge-mode when compiling.
|
||||
|
||||
2011-05-06 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* simple.el (list-processes): Return nil as the docstring says.
|
||||
|
||||
2011-05-05 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* net/ange-ftp.el (ange-ftp-binary-file-name-regexp): Set default
|
||||
to "".
|
||||
(ange-ftp-write-region, ange-ftp-insert-file-contents)
|
||||
(ange-ftp-copy-file-internal): Use only `ange-ftp-binary-file' for
|
||||
determining of binary transfer. (Bug#7383)
|
||||
|
||||
2011-05-05 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Fix
|
||||
port computation bug. (Bug#8618)
|
||||
|
||||
2011-05-05 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* allout-widgets.el (allout-widgets-mode-inhibit): Declare before use.
|
||||
|
||||
* simple.el (shell-dynamic-complete-functions)
|
||||
(comint-dynamic-complete-functions): Declare.
|
||||
|
||||
* net/network-stream.el (gnutls-negotiate):
|
||||
* simple.el (tabulated-list-print): Fix declarations.
|
||||
|
||||
* progmodes/gud.el (syntax-symbol, syntax-point):
|
||||
Remove unnecessary and incorrect declarations.
|
||||
|
||||
* emacs-lisp/check-declare.el (check-declare-scan):
|
||||
Handle byte-compile-initial-macro-environment in bytecomp.el
|
||||
|
||||
2011-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
|
|
|
|||
|
|
@ -246,6 +246,7 @@ Table is maintained iff `allout-widgets-maintain-tally' is non-nil.
|
|||
The table contents will be out of sync if any widgets are created
|
||||
or deleted while this variable is nil.")
|
||||
(make-variable-buffer-local 'allout-widgets-tally)
|
||||
(defvar allout-widgets-mode-inhibit) ; defined below
|
||||
;;;_ > allout-widgets-tally-string
|
||||
(defun allout-widgets-tally-string ()
|
||||
"Return a string giving the number of tracked widgets, or empty string if not tracking.
|
||||
|
|
|
|||
|
|
@ -142,6 +142,25 @@ See the documentation for the function `diary-list-sexp-entries'."
|
|||
:type 'string
|
||||
:group 'diary)
|
||||
|
||||
(defcustom diary-comment-start nil
|
||||
"String marking the start of a comment in the diary, or nil.
|
||||
Nil means there are no comments. The diary does not display
|
||||
parts of entries that are inside comments. You can use comments
|
||||
for whatever you like, e.g. for meta-data that packages such as
|
||||
`appt.el' can use.
|
||||
See also `diary-comment-end'."
|
||||
:version "24.1"
|
||||
:type '(choice (const :tag "No comment" nil) string)
|
||||
:group 'diary)
|
||||
|
||||
(defcustom diary-comment-end ""
|
||||
"String marking the end of a comment in the diary.
|
||||
The empty string means comments finish at the end of a line.
|
||||
See also `diary-comment-start'."
|
||||
:version "24.1"
|
||||
:type 'string
|
||||
:group 'diary)
|
||||
|
||||
(defcustom diary-hook nil
|
||||
"List of functions called after the display of the diary.
|
||||
Used for example by the appointment package - see `appt-activate'."
|
||||
|
|
@ -610,10 +629,15 @@ If LITERAL is nil, it is taken to be the same as STRING.
|
|||
|
||||
The entry is added to the list as (DATE STRING SPECIFIER LOCATOR
|
||||
GLOBCOLOR), where LOCATOR has the form (MARKER FILENAME LITERAL),
|
||||
FILENAME being the file containing the diary entry."
|
||||
FILENAME being the file containing the diary entry.
|
||||
|
||||
Modifies STRING using `diary-modify-entry-list-string-function', if non-nil.
|
||||
Also removes the region between `diary-comment-start' and
|
||||
`diary-comment-end', if the former is non-nil."
|
||||
(when (and date string)
|
||||
;; b-f-n is nil if we are visiting an include file in a temp-buffer.
|
||||
(let ((dfile (or (buffer-file-name) diary-file)))
|
||||
(let ((dfile (or (buffer-file-name) diary-file))
|
||||
cstart)
|
||||
(if diary-file-name-prefix
|
||||
(let ((prefix (funcall diary-file-name-prefix-function dfile)))
|
||||
(or (string-equal prefix "")
|
||||
|
|
@ -621,6 +645,16 @@ FILENAME being the file containing the diary entry."
|
|||
(and diary-modify-entry-list-string-function
|
||||
(setq string (funcall diary-modify-entry-list-string-function
|
||||
string)))
|
||||
(when (and diary-comment-start
|
||||
(string-match (setq cstart (regexp-quote diary-comment-start))
|
||||
string))
|
||||
;; Preserve the value with the comments.
|
||||
(or literal (setq literal string))
|
||||
(setq string (replace-regexp-in-string
|
||||
(format "%s.*%s" cstart
|
||||
(if (zerop (length diary-comment-end)) "$"
|
||||
(regexp-quote diary-comment-end)))
|
||||
"" string)))
|
||||
(setq diary-entries-list
|
||||
(append diary-entries-list
|
||||
(list (list date string specifier
|
||||
|
|
@ -2353,6 +2387,8 @@ return a font-lock pattern matching array of MONTHS and marking SYMBOL."
|
|||
"Major mode for editing the diary file."
|
||||
(set (make-local-variable 'font-lock-defaults)
|
||||
'(diary-font-lock-keywords t))
|
||||
(set (make-local-variable 'comment-start) diary-comment-start)
|
||||
(set (make-local-variable 'comment-end) diary-comment-end)
|
||||
(add-to-invisibility-spec '(diary . nil))
|
||||
(add-hook 'after-save-hook 'diary-redraw-calendar nil t)
|
||||
;; In case the file was modified externally, refresh the calendar
|
||||
|
|
|
|||
|
|
@ -88,9 +88,11 @@ don't know how to recognize (e.g. some macros)."
|
|||
;; FIXME we could theoretically be inside a string.
|
||||
(while (re-search-forward "^[ \t]*\\((declare-function\\)[ \t\n]" nil t)
|
||||
(goto-char (match-beginning 1))
|
||||
(if (and (setq form (ignore-errors (read (current-buffer)))
|
||||
len (length form))
|
||||
(> len 2) (< len 6)
|
||||
(if (and (setq form (ignore-errors (read (current-buffer))))
|
||||
;; Exclude element of byte-compile-initial-macro-environment.
|
||||
(or (listp (cdr form)) (setq form nil))
|
||||
(> (setq len (length form)) 2)
|
||||
(< len 6)
|
||||
(symbolp (setq fn (cadr form)))
|
||||
(setq fn (symbol-name fn)) ; later we use as a search string
|
||||
(stringp (setq fnfile (nth 2 form)))
|
||||
|
|
@ -104,7 +106,7 @@ don't know how to recognize (e.g. some macros)."
|
|||
(symbolp (setq fileonly (nth 4 form))))
|
||||
(setq alist (cons (list fnfile fn arglist fileonly) alist))
|
||||
;; FIXME make this more noticeable.
|
||||
(message "Malformed declaration for `%s'" (cadr form)))))
|
||||
(if form (message "Malformed declaration for `%s'" (cadr form))))))
|
||||
(message "%sdone" m)
|
||||
alist))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
2011-05-05 Teodor Zlatanov <tzz@lifelogs.com>
|
||||
|
||||
* shr.el (shr-urlify, shr-link): Still broken but at least doesn't
|
||||
error out because the face is not a list.
|
||||
|
||||
2011-05-05 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* gnus-start.el (gnus-propagate-marks): Declare.
|
||||
|
||||
2011-05-04 Teodor Zlatanov <tzz@lifelogs.com>
|
||||
|
||||
* registry.el (registry-reindex): Fix percentage message.
|
||||
|
|
|
|||
|
|
@ -1491,6 +1491,8 @@ If SCAN, request a scan of that group as well."
|
|||
;; Return the new active info.
|
||||
active)))))
|
||||
|
||||
(defvar gnus-propagate-marks) ; gnus-sum
|
||||
|
||||
(defun gnus-get-unread-articles-in-group (info active &optional update)
|
||||
(when (and info active)
|
||||
;; Allow the backend to update the info in the group.
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ cid: URL as the argument.")
|
|||
(defface shr-link '((t (:underline t)
|
||||
(:foreground "yellow")
|
||||
(:background "black")))
|
||||
"Font for <s> elements."
|
||||
"Font for link elements."
|
||||
:group 'shr)
|
||||
|
||||
;;; Internal variables.
|
||||
|
|
@ -597,7 +597,7 @@ START, and END. Note that START and END should be merkers."
|
|||
:help-echo (if title (format "%s (%s)" url title) url)
|
||||
:keymap shr-map
|
||||
url)
|
||||
(put-text-property start (point) 'face 'shr-link)
|
||||
(put-text-property start (point) 'face '(shr-link))
|
||||
(put-text-property start (point) 'shr-url url))
|
||||
|
||||
(defun shr-encode-url (url)
|
||||
|
|
|
|||
|
|
@ -856,15 +856,11 @@ If nil, prompt the user for a password."
|
|||
:type '(choice (const :tag "Default" nil)
|
||||
string))
|
||||
|
||||
(defcustom ange-ftp-binary-file-name-regexp
|
||||
(concat "TAGS\\'\\|\\.\\(?:"
|
||||
(eval-when-compile
|
||||
(regexp-opt '("z" "Z" "lzh" "arc" "zip" "zoo" "tar" "dvi"
|
||||
"ps" "elc" "gif" "gz" "taz" "tgz")))
|
||||
"\\|EXE\\(;[0-9]+\\)?\\|[zZ]-part-..\\)\\'")
|
||||
(defcustom ange-ftp-binary-file-name-regexp ""
|
||||
"If a file matches this regexp then it is transferred in binary mode."
|
||||
:group 'ange-ftp
|
||||
:type 'regexp)
|
||||
:type 'regexp
|
||||
:version "24.1")
|
||||
|
||||
(defcustom ange-ftp-gateway-host nil
|
||||
"Name of host to use as gateway machine when local FTP isn't possible."
|
||||
|
|
@ -3214,11 +3210,7 @@ system TYPE.")
|
|||
;; What we REALLY need here is a way to determine if the mode
|
||||
;; of the transfer is irrelevant, i.e. we can use binary mode
|
||||
;; regardless. Maybe a system-type to host-type lookup?
|
||||
(binary (or (ange-ftp-binary-file filename)
|
||||
(and (not (memq system-type
|
||||
'(ms-dos windows-nt)))
|
||||
(memq (ange-ftp-host-type host user)
|
||||
'(unix dumb-unix)))))
|
||||
(binary (ange-ftp-binary-file filename))
|
||||
(cmd (if append 'append 'put))
|
||||
(abbr (ange-ftp-abbreviate-filename filename))
|
||||
;; we need to reset `last-coding-system-used' to its
|
||||
|
|
@ -3290,9 +3282,7 @@ system TYPE.")
|
|||
(user (nth 1 parsed))
|
||||
(name (ange-ftp-quote-string (nth 2 parsed)))
|
||||
(temp (ange-ftp-make-tmp-name host))
|
||||
(binary (or (ange-ftp-binary-file filename)
|
||||
(memq (ange-ftp-host-type host user)
|
||||
'(unix dumb-unix))))
|
||||
(binary (ange-ftp-binary-file filename))
|
||||
(abbr (ange-ftp-abbreviate-filename filename))
|
||||
(coding-system-used last-coding-system-used)
|
||||
size)
|
||||
|
|
@ -3674,11 +3664,7 @@ so return the size on the remote host exactly. See RFC 3659."
|
|||
(t-name (and t-parsed (ange-ftp-quote-string (nth 2 t-parsed))))
|
||||
(t-abbr (ange-ftp-abbreviate-filename newname filename))
|
||||
(binary (or (ange-ftp-binary-file filename)
|
||||
(ange-ftp-binary-file newname)
|
||||
(and (memq (ange-ftp-host-type f-host f-user)
|
||||
'(unix dumb-unix))
|
||||
(memq (ange-ftp-host-type t-host t-user)
|
||||
'(unix dumb-unix)))))
|
||||
(ange-ftp-binary-file newname)))
|
||||
temp1
|
||||
temp2)
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
(require 'tls)
|
||||
(require 'starttls)
|
||||
|
||||
(declare-function gnutls-negotiate "gnutls" (&rest spec))
|
||||
(declare-function gnutls-negotiate "gnutls" t t) ; defun*
|
||||
|
||||
;;;###autoload
|
||||
(defun open-network-stream (name buffer host service &rest parameters)
|
||||
|
|
|
|||
|
|
@ -2260,8 +2260,8 @@ The method used must be an out-of-band method."
|
|||
(setq host (tramp-file-name-host v)
|
||||
port "")
|
||||
(when (string-match tramp-host-with-port-regexp host)
|
||||
(setq host (string-to-number (match-string 1 host))
|
||||
port (string-to-number (match-string 2 host))))
|
||||
(setq port (string-to-number (match-string 2 host))
|
||||
host (string-to-number (match-string 1 host))))
|
||||
|
||||
;; Compose copy command.
|
||||
(setq spec (format-spec-make
|
||||
|
|
|
|||
|
|
@ -3042,8 +3042,6 @@ Link exprs of the form:
|
|||
|
||||
(declare-function c-langelem-sym "cc-defs" (langelem))
|
||||
(declare-function c-langelem-pos "cc-defs" (langelem))
|
||||
(declare-function syntax-symbol "gud" (x))
|
||||
(declare-function syntax-point "gud" (x))
|
||||
|
||||
(defun gud-find-class (f _line)
|
||||
"Find fully qualified class in file F at line LINE.
|
||||
|
|
|
|||
|
|
@ -2170,6 +2170,9 @@ to the end of the list of defaults just after the default value."
|
|||
(defvar shell-delimiter-argument-list)
|
||||
(defvar shell-file-name-chars)
|
||||
(defvar shell-file-name-quote-list)
|
||||
(defvar shell-dynamic-complete-functions)
|
||||
;; shell requires comint.
|
||||
(defvar comint-dynamic-complete-functions)
|
||||
|
||||
(defvar minibuffer-local-shell-command-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
|
|
@ -2707,7 +2710,8 @@ support pty association, if PROGRAM is nil."
|
|||
(defvar tabulated-list-entries)
|
||||
(defvar tabulated-list-sort-key)
|
||||
(declare-function tabulated-list-init-header "tabulated-list" ())
|
||||
(declare-function tabulated-list-print "tabulated-list" ())
|
||||
(declare-function tabulated-list-print "tabulated-list"
|
||||
(&optional remember-pos))
|
||||
|
||||
(defvar process-menu-query-only nil)
|
||||
|
||||
|
|
@ -2788,7 +2792,8 @@ The return value is always nil."
|
|||
(setq process-menu-query-only query-only)
|
||||
(list-processes--refresh)
|
||||
(tabulated-list-print))
|
||||
(display-buffer buffer))
|
||||
(display-buffer buffer)
|
||||
nil)
|
||||
|
||||
(defvar universal-argument-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
|
|
|
|||
|
|
@ -1825,10 +1825,13 @@ For use in `add-log-current-defun-function'."
|
|||
(replace-match (cdr (assq (char-before) '((?+ . "-") (?> . "<"))))))
|
||||
)
|
||||
|
||||
(declare-function smerge-refine-subst "smerge-mode"
|
||||
(beg1 end1 beg2 end2 props &optional preproc))
|
||||
|
||||
(defun diff-refine-hunk ()
|
||||
"Highlight changes of hunk at point at a finer granularity."
|
||||
(interactive)
|
||||
(eval-and-compile (require 'smerge-mode))
|
||||
(require 'smerge-mode)
|
||||
(save-excursion
|
||||
(diff-beginning-of-hunk 'try-harder)
|
||||
(let* ((start (point))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
2011-05-05 Paul Eggert <eggert@cs.ucla.edu>
|
||||
2011-05-06 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* image.c (Finit_image_library) [!HAVE_NTGUI]: Omit unused local.
|
||||
|
||||
|
|
@ -113,6 +113,16 @@
|
|||
|
||||
* fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.
|
||||
|
||||
2011-05-06 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* gnutls.c (DEF_GNUTLS_FN):
|
||||
* image.c (DEF_IMGLIB_FN): Make function pointers static.
|
||||
|
||||
2011-05-05 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
* lread.c (lisp_file_lexically_bound_p): Stop scanning at end
|
||||
marker. (Bug#8610)
|
||||
|
||||
2011-05-05 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ static void gnutls_log_function2 (int, const char*, const char*);
|
|||
#ifdef WINDOWSNT
|
||||
|
||||
/* Macro for defining functions that will be loaded from the GnuTLS DLL. */
|
||||
#define DEF_GNUTLS_FN(rettype,func,args) rettype (FAR CDECL *fn_##func)args
|
||||
#define DEF_GNUTLS_FN(rettype,func,args) static rettype (FAR CDECL *fn_##func)args
|
||||
|
||||
/* Macro for loading GnuTLS functions from the library. */
|
||||
#define LOAD_GNUTLS_FN(lib,func) { \
|
||||
|
|
|
|||
|
|
@ -1892,7 +1892,7 @@ mark_image_cache (struct image_cache *c)
|
|||
#ifdef HAVE_NTGUI
|
||||
|
||||
/* Macro for defining functions that will be loaded from image DLLs. */
|
||||
#define DEF_IMGLIB_FN(rettype,func,args) rettype (FAR CDECL *fn_##func)args
|
||||
#define DEF_IMGLIB_FN(rettype,func,args) static rettype (FAR CDECL *fn_##func)args
|
||||
|
||||
/* Macro for loading those image functions from the library. */
|
||||
#define LOAD_IMGLIB_FN(lib,func) { \
|
||||
|
|
|
|||
|
|
@ -829,7 +829,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
|
|||
ch = READCHAR;
|
||||
|
||||
i = 0;
|
||||
while (ch != ':' && ch != '\n' && ch != EOF)
|
||||
while (ch != ':' && ch != '\n' && ch != EOF && in_file_vars)
|
||||
{
|
||||
if (i < sizeof var - 1)
|
||||
var[i++] = ch;
|
||||
|
|
@ -837,6 +837,10 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
|
|||
ch = READCHAR;
|
||||
}
|
||||
|
||||
/* Stop scanning if no colon was found before end marker. */
|
||||
if (!in_file_vars)
|
||||
break;
|
||||
|
||||
while (i > 0 && (var[i - 1] == ' ' || var[i - 1] == '\t'))
|
||||
i--;
|
||||
var[i] = '\0';
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue