mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-15 09:47:20 +00:00
Merge branch 'master' into xwidget
This commit is contained in:
Joakim Verona
commit
2a9de01372
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2015-01-27 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Port autogen.sh hook creation to Apple Git
|
||||
* autogen.sh: Do not assume that the hook samples exist.
|
||||
This ports to git version 1.9.3 (Apple Git-50).
|
||||
For some reason Apple decided to populate the git hooks directory
|
||||
in a different way from the way that standard Git does it.
|
||||
The downside is that patch applications won't be checked on Apple,
|
||||
but that's better than autogen.sh failing.
|
||||
Problem reported by Sam Steingold in:
|
||||
http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00898.html
|
||||
|
||||
2015-01-26 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* INSTALL.REPO: Mention minimum Git version.
|
||||
|
||||
@ -226,6 +226,7 @@ if test -d .git/hooks; then
|
||||
tailored_hooks="$tailored_hooks $hook"
|
||||
done
|
||||
for hook in applypatch-msg pre-applypatch; do
|
||||
test ! -r .git/hooks/$hook.sample ||
|
||||
cmp .git/hooks/$hook.sample .git/hooks/$hook >/dev/null 2>&1 ||
|
||||
sample_hooks="$sample_hooks $hook"
|
||||
done
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2015-01-27 Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
|
||||
* NEWS: Document EUDC improvements.
|
||||
|
||||
2015-01-26 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* publicsuffix.txt: Install an updated version of the file from
|
||||
|
||||
32
etc/NEWS
32
etc/NEWS
@ -495,6 +495,38 @@ As a result of the above, these commands are now obsolete:
|
||||
`find-tag-other-window', `find-tag-other-frame', `find-tag-regexp',
|
||||
`tags-apropos' and `tags-loop-continue'.
|
||||
|
||||
** EUDC
|
||||
EUDC's LDAP backend has been improved.
|
||||
|
||||
*** EUDC supports LDAP-over-SSL URLs (ldaps://).
|
||||
|
||||
*** EUDC passes LDAP passwords through a pipe to the ldapsearch
|
||||
subprocess instead of on the command line.
|
||||
|
||||
*** EUDC handles LDAP wildcards automatically so the user shouldn't
|
||||
need to configure this manually anymore.
|
||||
|
||||
*** The LDAP configuration section of EUDC's manual has been
|
||||
rewritten.
|
||||
|
||||
There have also been customization changes.
|
||||
|
||||
*** New custom variable `eudc-server-hotlist' to allow specifying
|
||||
multiple EUDC servers in init file.
|
||||
|
||||
*** Custom variable `eudc-inline-query-format' defaults to completing
|
||||
on email and firstname instead of surname.
|
||||
|
||||
*** Custom variable `eudc-expansion-overwrites-query' defaults to nil
|
||||
to avoid interfering with the kill ring.
|
||||
|
||||
*** Custom variable `eudc-inline-expansion-format' defaults to
|
||||
"Firstname Surname <mail-address>".
|
||||
|
||||
*** New custom variable `ldap-ldapsearch-password-prompt-regexp' to
|
||||
allow overriding the regular expression that recognizes the ldapsearch
|
||||
command line's password prompt.
|
||||
|
||||
** Obsolete packages
|
||||
|
||||
---
|
||||
|
||||
@ -1,5 +1,30 @@
|
||||
2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
2015-01-27 Sam Steingold <sds@gnu.org>
|
||||
|
||||
* progmodes/python.el (python-check-custom-command): Buffer local
|
||||
because it usually includes the buffer name.
|
||||
(python-check-command): Set to epylint when pyflakes is not available.
|
||||
|
||||
2015-01-27 Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
|
||||
* net/eudcb-bbdb.el, net/eudcb-ldap.el, net/eudcb-mab.el,
|
||||
net/eudc-bob.el, net/eudcb-ph.el, net/eudc.el, net/eudc-export.el,
|
||||
net/eudc-hotlist.el, net/eudc-vars.el: New maintainer.
|
||||
|
||||
2015-01-27 Artur Malabarba <bruce.connor.am@gmail.com>
|
||||
|
||||
* isearch.el (isearch-process-search-char): Add docstring.
|
||||
|
||||
2015-01-27 Oleh Krehel <ohwoeowho@gmail.com>
|
||||
|
||||
* emacs-lisp/derived.el (define-derived-mode): Declare indent 3.
|
||||
|
||||
2015-01-27 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
* emacs-lisp/cl.el (cl--function-convert): Run cl--labels-convert
|
||||
for the case cl-flet or cl-labels form is wrapped with lexical-let
|
||||
(bug#19613).
|
||||
|
||||
2015-01-26 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* emacs-lisp/cl-generic.el (cl--generic-method): New struct.
|
||||
(cl--generic): The method-table is now a (list-of cl--generic-method).
|
||||
|
||||
@ -342,6 +342,8 @@ The two cases that are handled are:
|
||||
- renaming of F when it's a function defined via `cl-labels' or `labels'."
|
||||
(require 'cl-macs)
|
||||
(declare-function cl--expr-contains-any "cl-macs" (x y))
|
||||
(declare-function cl--labels-convert "cl-macs" (f))
|
||||
(defvar cl--labels-convert-cache)
|
||||
(cond
|
||||
;; ¡¡Big Ugly Hack!! We can't use a compiler-macro because those are checked
|
||||
;; *after* handling `function', but we want to stop macroexpansion from
|
||||
@ -374,13 +376,8 @@ The two cases that are handled are:
|
||||
(setq cl--function-convert-cache (cons newf res))
|
||||
res))))
|
||||
(t
|
||||
(let ((found (assq f macroexpand-all-environment)))
|
||||
(if (and found (ignore-errors
|
||||
(eq (cadr (cl-caddr found)) 'cl-labels-args)))
|
||||
(cadr (cl-caddr (cl-cadddr found)))
|
||||
(let ((res `(function ,f)))
|
||||
(setq cl--function-convert-cache (cons f res))
|
||||
res))))))
|
||||
(setq cl--labels-convert-cache cl--function-convert-cache)
|
||||
(cl--labels-convert f))))
|
||||
|
||||
(defmacro lexical-let (bindings &rest body)
|
||||
"Like `let', but lexically scoped.
|
||||
|
||||
@ -162,7 +162,8 @@ The new mode runs the hook constructed by the function
|
||||
See Info node `(elisp)Derived Modes' for more details."
|
||||
(declare (debug (&define name symbolp sexp [&optional stringp]
|
||||
[&rest keywordp sexp] def-body))
|
||||
(doc-string 4))
|
||||
(doc-string 4)
|
||||
(indent 3))
|
||||
|
||||
(when (and docstring (not (stringp docstring)))
|
||||
;; Some trickiness, since what appears to be the docstring may really be
|
||||
|
||||
@ -1258,7 +1258,7 @@ method invocation orders of the involved classes."
|
||||
(eieio--class-precedence-list tag))))
|
||||
|
||||
|
||||
;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "57805f02023795a01567781e70aaf9f9")
|
||||
;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "b568ffb3c90ed5d0ae673f0051d608ee")
|
||||
;;; Generated autoloads from eieio-compat.el
|
||||
|
||||
(autoload 'eieio--defalias "eieio-compat" "\
|
||||
|
||||
@ -942,7 +942,7 @@ Optional argument GROUP is the sub-group of slots to display.
|
||||
|
||||
;;;***
|
||||
|
||||
;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "d7b8682e15aebad7dbe6384dc5ed655f")
|
||||
;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "b849f8bf1312d5ef57e53d02173e4b5a")
|
||||
;;; Generated autoloads from eieio-opt.el
|
||||
|
||||
(autoload 'eieio-browse "eieio-opt" "\
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
2015-01-27 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
* nnir.el (nnir-imap-expr-to-imap): Check for literal+ capability in
|
||||
IMAP.
|
||||
|
||||
2015-01-27 Eric Abrahamsen <eric@ericabrahamsen.net>
|
||||
|
||||
* nnir.el (nnir-run-imap): Enable non-ASCII IMAP searches.
|
||||
|
||||
* nnmairix.el ("nnmairix"): Declare nnmairix as virtual.
|
||||
|
||||
* gnus-bcklg.el (gnus-backlog-enter-article): No virtual groups should
|
||||
be added to the backlog.
|
||||
|
||||
2015-01-26 Trevor Murphy <trevor.m.murphy@gmail.com>
|
||||
|
||||
* nnimap.el (nnimap-header-parameters): Refactor and request
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
|
||||
(defun gnus-backlog-enter-article (group number buffer)
|
||||
(when (and (numberp number)
|
||||
(not (string-match "^nnvirtual" group)))
|
||||
(not (gnus-virtual-group-p group)))
|
||||
(gnus-backlog-setup)
|
||||
(let ((ident (intern (concat group ":" (int-to-string number))
|
||||
gnus-backlog-hashtb))
|
||||
@ -126,7 +126,7 @@
|
||||
|
||||
(defun gnus-backlog-request-article (group number &optional buffer)
|
||||
(when (and (numberp number)
|
||||
(not (string-match "^nnvirtual" group)))
|
||||
(not (gnus-virtual-group-p group)))
|
||||
(gnus-backlog-setup)
|
||||
(let ((ident (intern (concat group ":" (int-to-string number))
|
||||
gnus-backlog-hashtb))
|
||||
|
||||
@ -284,6 +284,8 @@ is `(valuefunc member)'."
|
||||
(eval-when-compile
|
||||
(autoload 'nnimap-buffer "nnimap")
|
||||
(autoload 'nnimap-command "nnimap")
|
||||
(autoload 'nnimap-capability "nnimap")
|
||||
(autoload 'nnimap-wait-for-line "nnimap")
|
||||
(autoload 'nnimap-change-group "nnimap")
|
||||
(autoload 'nnimap-make-thread-query "nnimap")
|
||||
(autoload 'gnus-registry-action "gnus-registry")
|
||||
@ -968,33 +970,52 @@ details on the language and supported extensions."
|
||||
(catch 'found
|
||||
(mapcar
|
||||
#'(lambda (group)
|
||||
(let (artlist)
|
||||
(condition-case ()
|
||||
(when (nnimap-change-group
|
||||
(gnus-group-short-name group) server)
|
||||
(with-current-buffer (nnimap-buffer)
|
||||
(message "Searching %s..." group)
|
||||
(let ((arts 0)
|
||||
(result (nnimap-command "UID SEARCH %s"
|
||||
(if (string= criteria "")
|
||||
qstring
|
||||
(nnir-imap-make-query
|
||||
criteria qstring)))))
|
||||
(mapc
|
||||
(lambda (artnum)
|
||||
(let ((artn (string-to-number artnum)))
|
||||
(when (> artn 0)
|
||||
(push (vector group artn 100)
|
||||
artlist)
|
||||
(when (assq 'shortcut query)
|
||||
(throw 'found (list artlist)))
|
||||
(setq arts (1+ arts)))))
|
||||
(and (car result)
|
||||
(cdr (assoc "SEARCH" (cdr result)))))
|
||||
(message "Searching %s... %d matches" group arts)))
|
||||
(message "Searching %s...done" group))
|
||||
(quit nil))
|
||||
(nreverse artlist)))
|
||||
(let (artlist)
|
||||
(condition-case ()
|
||||
(when (nnimap-change-group
|
||||
(gnus-group-short-name group) server)
|
||||
(with-current-buffer (nnimap-buffer)
|
||||
(message "Searching %s..." group)
|
||||
(let* ((arts 0)
|
||||
(literal+ (nnimap-capability "LITERAL+"))
|
||||
(search (split-string
|
||||
(if (string= criteria "")
|
||||
qstring
|
||||
(nnir-imap-make-query
|
||||
criteria qstring))
|
||||
"\n"))
|
||||
(coding (upcase
|
||||
(replace-regexp-in-string
|
||||
"-\\(unix\\|dos\\|mac\\)" ""
|
||||
(symbol-name
|
||||
(cdr default-process-coding-system)))))
|
||||
call result)
|
||||
(setq call (nnimap-send-command
|
||||
"UID SEARCH CHARSET %s %s" coding (pop search)))
|
||||
(while search ; Non-ascii search terms
|
||||
(unless literal+
|
||||
(nnimap-wait-for-line "^\\+\\(.*\\)\n"))
|
||||
(process-send-string (get-buffer-process (current-buffer)) (pop search))
|
||||
(process-send-string (get-buffer-process (current-buffer))
|
||||
(if (nnimap-newlinep nnimap-object)
|
||||
"\n"
|
||||
"\r\n")))
|
||||
(setq result (nnimap-get-response call))
|
||||
(mapc
|
||||
(lambda (artnum)
|
||||
(let ((artn (string-to-number artnum)))
|
||||
(when (> artn 0)
|
||||
(push (vector group artn 100)
|
||||
artlist)
|
||||
(when (assq 'shortcut query)
|
||||
(throw 'found (list artlist)))
|
||||
(setq arts (1+ arts)))))
|
||||
(and (car result)
|
||||
(cdr (assoc "SEARCH" (cdr result)))))
|
||||
(message "Searching %s... %d matches" group arts)))
|
||||
(message "Searching %s...done" group))
|
||||
(quit nil))
|
||||
(nreverse artlist)))
|
||||
groups))))))
|
||||
|
||||
(defun nnir-imap-make-query (criteria qstring)
|
||||
@ -1048,25 +1069,30 @@ In future the following will be added to the language:
|
||||
(defun nnir-imap-expr-to-imap (criteria expr)
|
||||
"Convert EXPR into an IMAP search expression on CRITERIA"
|
||||
;; What sort of expression is this, eh?
|
||||
(cond
|
||||
;; Simple string term
|
||||
((stringp expr)
|
||||
(format "%s %S" criteria expr))
|
||||
;; Trivial term: and
|
||||
((eq expr 'and) nil)
|
||||
;; Composite term: or expression
|
||||
((eq (car-safe expr) 'or)
|
||||
(format "OR %s %s"
|
||||
(nnir-imap-expr-to-imap criteria (second expr))
|
||||
(nnir-imap-expr-to-imap criteria (third expr))))
|
||||
;; Composite term: just the fax, mam
|
||||
((eq (car-safe expr) 'not)
|
||||
(format "NOT (%s)" (nnir-imap-query-to-imap criteria (rest expr))))
|
||||
;; Composite term: just expand it all.
|
||||
((and (not (null expr)) (listp expr))
|
||||
(format "(%s)" (nnir-imap-query-to-imap criteria expr)))
|
||||
;; Complex value, give up for now.
|
||||
(t (error "Unhandled input: %S" expr))))
|
||||
(let ((literal+ (nnimap-capability "LITERAL+")))
|
||||
(cond
|
||||
;; Simple string term
|
||||
((stringp expr)
|
||||
(format "%s %S" criteria expr))
|
||||
;; Trivial term: and
|
||||
((eq expr 'and) nil)
|
||||
;; Composite term: or expression
|
||||
((eq (car-safe expr) 'or)
|
||||
(format "OR %s %s"
|
||||
(nnir-imap-expr-to-imap criteria (second expr))
|
||||
(nnir-imap-expr-to-imap criteria (third expr))))
|
||||
;; Composite term: just the fax, mam
|
||||
((eq (car-safe expr) 'not)
|
||||
(format "NOT (%s)" (nnir-imap-query-to-imap criteria (rest expr))))
|
||||
;; Composite term: non-ascii search term
|
||||
((numberp (car-safe expr))
|
||||
(format "%s {%d%s}\n%s" criteria (car expr)
|
||||
(if literal+ "+" "") (second expr)))
|
||||
;; Composite term: just expand it all.
|
||||
((and (not (null expr)) (listp expr))
|
||||
(format "(%s)" (nnir-imap-query-to-imap criteria expr)))
|
||||
;; Complex value, give up for now.
|
||||
(t (error "Unhandled input: %S" expr)))))
|
||||
|
||||
|
||||
(defun nnir-imap-parse-query (string)
|
||||
@ -1108,6 +1134,11 @@ that the search language can then understand and use."
|
||||
((eq term 'and) 'and)
|
||||
;; negated term
|
||||
((eq term 'not) (list 'not (nnir-imap-next-expr)))
|
||||
;; non-ascii search string
|
||||
((and (stringp term)
|
||||
(not (= (string-bytes term)
|
||||
(length term))))
|
||||
(list (string-bytes term) term))
|
||||
;; generic term
|
||||
(t term))))
|
||||
|
||||
|
||||
@ -417,7 +417,7 @@ Other back ends might or might not work.")
|
||||
|
||||
(nnoo-define-basics nnmairix)
|
||||
|
||||
(gnus-declare-backend "nnmairix" 'mail 'address)
|
||||
(gnus-declare-backend "nnmairix" 'mail 'address 'virtual)
|
||||
|
||||
(deffoo nnmairix-open-server (server &optional definitions)
|
||||
;; just set server variables
|
||||
|
||||
@ -2349,6 +2349,8 @@ With argument, add COUNT copies of the character."
|
||||
(isearch-process-search-char char count))))
|
||||
|
||||
(defun isearch-process-search-char (char &optional count)
|
||||
"Add CHAR to the search string, COUNT times.
|
||||
Search is updated accordingly."
|
||||
;; * and ? are special in regexps when not preceded by \.
|
||||
;; } and | are special in regexps when preceded by \.
|
||||
;; Nothing special for + because it matches at least once.
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
||||
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||
;; Pavel Janík <Pavel@Janik.cz>
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
;; Package: eudc
|
||||
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
||||
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||
;; Pavel Janík <Pavel@Janik.cz>
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
;; Package: eudc
|
||||
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
||||
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||
;; Pavel Janík <Pavel@Janik.cz>
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
;; Package: eudc
|
||||
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
||||
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||
;; Pavel Janík <Pavel@Janik.cz>
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
;; Package: eudc
|
||||
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
||||
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||
;; Pavel Janík <Pavel@Janik.cz>
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
||||
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||
;; Pavel Janík <Pavel@Janik.cz>
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
;; Package: eudc
|
||||
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
||||
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||
;; Pavel Janík <Pavel@Janik.cz>
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
;; Package: eudc
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
;; Copyright (C) 2003-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: John Wiegley <johnw@newartisans.com>
|
||||
;; Maintainer: emacs-devel@gnu.org
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
;; Package: eudc
|
||||
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
||||
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
|
||||
;; Pavel Janík <Pavel@Janik.cz>
|
||||
;; Maintainer: Thomas Fitzsimmons <fitzsim@fitzsim.org>
|
||||
;; Keywords: comm
|
||||
;; Package: eudc
|
||||
|
||||
|
||||
@ -3816,7 +3816,9 @@ The skeleton will be bound to python-skeleton-NAME."
|
||||
;;; Code check
|
||||
|
||||
(defcustom python-check-command
|
||||
"pyflakes"
|
||||
(or (executable-find "pyflakes")
|
||||
(executable-find "epylint")
|
||||
"install pyflakes, pylint or something else")
|
||||
"Command used to check a Python file."
|
||||
:type 'string
|
||||
:group 'python)
|
||||
@ -3827,7 +3829,7 @@ The skeleton will be bound to python-skeleton-NAME."
|
||||
:type 'string
|
||||
:group 'python)
|
||||
|
||||
(defvar python-check-custom-command nil
|
||||
(defvar-local python-check-custom-command nil
|
||||
"Internal use.")
|
||||
|
||||
(defun python-check (command)
|
||||
|
||||
@ -1,3 +1,46 @@
|
||||
2015-01-27 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Use bool for boolean in xfaces.c
|
||||
* dispextern.h: Adjust to signature changes.
|
||||
* font.c (font_at, font_range):
|
||||
* fontset.c (Finternal_char_font):
|
||||
* fringe.c (draw_fringe_bitmap_1):
|
||||
* xdisp.c (handle_face_prop, face_before_or_after_it_pos)
|
||||
(get_next_display_element, highlight_trailing_whitespace)
|
||||
(display_string, calc_line_height_property)
|
||||
(note_mode_line_or_margin_highlight, note_mouse_highlight):
|
||||
* xfaces.c (tty_suppress_bold_inverse_default_colors_p)
|
||||
(menu_face_changed_default, recompute_basic_faces)
|
||||
(Fbitmap_spec_p, parse_rgb_list, tty_lookup_color)
|
||||
(tty_defined_color, defined_color, face_color_gray_p)
|
||||
(face_color_supported_p, load_color2, load_face_colors)
|
||||
(Fx_list_fonts, LFACEP, push_named_merge_point)
|
||||
(resolve_face_name, lface_from_face_name_no_resolve)
|
||||
(lface_from_face_name, get_lface_attributes_no_remap)
|
||||
(get_lface_attributes, lface_fully_specified_p)
|
||||
(set_lface_from_font, merge_face_vectors, merge_named_face)
|
||||
(merge_face_ref, Finternal_make_lisp_face)
|
||||
(Finternal_lisp_face_p, Finternal_copy_lisp_face)
|
||||
(Finternal_set_lisp_face_attribute)
|
||||
(update_face_from_frame_parameter, set_font_frame_param)
|
||||
(face_boolean_x_resource_value)
|
||||
(Finternal_set_lisp_face_attribute_from_resource)
|
||||
(x_update_menu_appearance, Finternal_get_lisp_face_attribute)
|
||||
(Finternal_merge_in_global_face, Fface_font, face_attr_equal_p)
|
||||
(lface_equal_p, Finternal_lisp_face_equal_p)
|
||||
(Finternal_lisp_face_empty_p, lface_same_font_attributes_p)
|
||||
(Fcolor_distance, lookup_named_face, lookup_basic_face)
|
||||
(lookup_derived_face, Fface_attributes_as_vector)
|
||||
(x_supports_face_attributes_p, tty_supports_face_attributes_p)
|
||||
(Fdisplay_supports_face_attributes_p, realize_basic_faces)
|
||||
(realize_default_face, realize_named_face)
|
||||
(realize_non_ascii_face, realize_x_face, map_tty_color)
|
||||
(realize_tty_face, compute_char_face, face_at_buffer_position)
|
||||
(face_for_overlay_string, face_at_string_position):
|
||||
Use bool for boolean.
|
||||
* xfaces.c (set_lface_from_font):
|
||||
Return void, since callers never use the result.
|
||||
|
||||
2015-01-26 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
* image.c (lookup_pixel_color): Reorder conditions that are
|
||||
|
||||
@ -3407,23 +3407,20 @@ char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object,
|
||||
#ifdef HAVE_WINDOW_SYSTEM
|
||||
void prepare_face_for_display (struct frame *, struct face *);
|
||||
#endif
|
||||
int lookup_named_face (struct frame *, Lisp_Object, int);
|
||||
int lookup_named_face (struct frame *, Lisp_Object, bool);
|
||||
int lookup_basic_face (struct frame *, int);
|
||||
int smaller_face (struct frame *, int, int);
|
||||
int face_with_height (struct frame *, int, int);
|
||||
int lookup_derived_face (struct frame *, Lisp_Object, int, int);
|
||||
int lookup_derived_face (struct frame *, Lisp_Object, int, bool);
|
||||
void init_frame_faces (struct frame *);
|
||||
void free_frame_faces (struct frame *);
|
||||
void recompute_basic_faces (struct frame *);
|
||||
int face_at_buffer_position (struct window *w, ptrdiff_t pos,
|
||||
ptrdiff_t *endptr, ptrdiff_t limit,
|
||||
int mouse, int base_face_id);
|
||||
int face_for_overlay_string (struct window *w, ptrdiff_t pos,
|
||||
ptrdiff_t *endptr, ptrdiff_t limit,
|
||||
int mouse, Lisp_Object overlay);
|
||||
int face_at_string_position (struct window *w, Lisp_Object string,
|
||||
ptrdiff_t pos, ptrdiff_t bufpos,
|
||||
ptrdiff_t *endptr, enum face_id, int mouse);
|
||||
int face_at_buffer_position (struct window *, ptrdiff_t, ptrdiff_t *, ptrdiff_t,
|
||||
bool, int);
|
||||
int face_for_overlay_string (struct window *, ptrdiff_t, ptrdiff_t *, ptrdiff_t,
|
||||
bool, Lisp_Object);
|
||||
int face_at_string_position (struct window *, Lisp_Object, ptrdiff_t, ptrdiff_t,
|
||||
ptrdiff_t *, enum face_id, bool);
|
||||
int merge_faces (struct frame *, Lisp_Object, int, int);
|
||||
int compute_char_face (struct frame *, int, Lisp_Object);
|
||||
void free_all_realized_faces (Lisp_Object);
|
||||
|
||||
@ -3707,10 +3707,10 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
|
||||
|
||||
if (STRINGP (string))
|
||||
face_id = face_at_string_position (w, string, pos, 0, &endptr,
|
||||
DEFAULT_FACE_ID, 0);
|
||||
DEFAULT_FACE_ID, false);
|
||||
else
|
||||
face_id = face_at_buffer_position (w, pos, &endptr,
|
||||
pos + 100, 0, -1);
|
||||
pos + 100, false, -1);
|
||||
face = FACE_FROM_ID (f, face_id);
|
||||
}
|
||||
if (multibyte)
|
||||
@ -3754,7 +3754,7 @@ font_range (ptrdiff_t pos, ptrdiff_t pos_byte, ptrdiff_t *limit,
|
||||
int face_id;
|
||||
|
||||
face_id = face_at_buffer_position (w, pos, &ignore,
|
||||
*limit, 0, -1);
|
||||
*limit, false, -1);
|
||||
face = FACE_FROM_ID (XFRAME (w->frame), face_id);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1828,7 +1828,7 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
|
||||
w = XWINDOW (window);
|
||||
f = XFRAME (w->frame);
|
||||
face_id = face_at_buffer_position (w, pos, &dummy,
|
||||
pos + 100, 0, -1);
|
||||
pos + 100, false, -1);
|
||||
}
|
||||
if (! CHAR_VALID_P (c))
|
||||
return Qnil;
|
||||
|
||||
@ -587,7 +587,7 @@ draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int o
|
||||
if (face_id == DEFAULT_FACE_ID)
|
||||
{
|
||||
Lisp_Object face = fringe_faces[which];
|
||||
face_id = NILP (face) ? lookup_named_face (f, Qfringe, 0)
|
||||
face_id = NILP (face) ? lookup_named_face (f, Qfringe, false)
|
||||
: lookup_derived_face (f, face, FRINGE_FACE_ID, 0);
|
||||
if (face_id < 0)
|
||||
face_id = FRINGE_FACE_ID;
|
||||
|
||||
22
src/xdisp.c
22
src/xdisp.c
@ -3883,7 +3883,7 @@ handle_face_prop (struct it *it)
|
||||
&next_stop,
|
||||
(IT_CHARPOS (*it)
|
||||
+ TEXT_PROP_DISTANCE_LIMIT),
|
||||
0, it->base_face_id);
|
||||
false, it->base_face_id);
|
||||
|
||||
/* Is this a start of a run of characters with box face?
|
||||
Caveat: this can be called for a freshly initialized
|
||||
@ -3959,7 +3959,7 @@ handle_face_prop (struct it *it)
|
||||
&next_stop,
|
||||
(IT_CHARPOS (*it)
|
||||
+ TEXT_PROP_DISTANCE_LIMIT),
|
||||
0,
|
||||
false,
|
||||
from_overlay);
|
||||
}
|
||||
else
|
||||
@ -3994,7 +3994,7 @@ handle_face_prop (struct it *it)
|
||||
IT_STRING_CHARPOS (*it),
|
||||
bufpos,
|
||||
&next_stop,
|
||||
base_face_id, 0);
|
||||
base_face_id, false);
|
||||
|
||||
/* Is this a start of a run of characters with box? Caveat:
|
||||
this can be called for a freshly allocated iterator; face_id
|
||||
@ -4136,7 +4136,7 @@ face_before_or_after_it_pos (struct it *it, int before_p)
|
||||
charpos,
|
||||
bufpos,
|
||||
&next_check_charpos,
|
||||
base_face_id, 0);
|
||||
base_face_id, false);
|
||||
|
||||
/* Correct the face for charsets different from ASCII. Do it
|
||||
for the multibyte case only. The face returned above is
|
||||
@ -4225,7 +4225,7 @@ face_before_or_after_it_pos (struct it *it, int before_p)
|
||||
face_id = face_at_buffer_position (it->w,
|
||||
CHARPOS (pos),
|
||||
&next_check_charpos,
|
||||
limit, 0, -1);
|
||||
limit, false, -1);
|
||||
|
||||
/* Correct the face for charsets different from ASCII. Do it
|
||||
for the multibyte case only. The face returned above is
|
||||
@ -7203,7 +7203,7 @@ get_next_display_element (struct it *it)
|
||||
{
|
||||
next_face_id = face_at_buffer_position
|
||||
(it->w, CHARPOS (pos), &ignore,
|
||||
CHARPOS (pos) + TEXT_PROP_DISTANCE_LIMIT, 0, -1);
|
||||
CHARPOS (pos) + TEXT_PROP_DISTANCE_LIMIT, false, -1);
|
||||
it->end_of_box_run_p
|
||||
= (FACE_FROM_ID (it->f, next_face_id)->box
|
||||
== FACE_NO_BOX);
|
||||
@ -19632,7 +19632,7 @@ highlight_trailing_whitespace (struct frame *f, struct glyph_row *row)
|
||||
&& glyph->u.ch == ' '))
|
||||
&& trailing_whitespace_p (glyph->charpos))
|
||||
{
|
||||
int face_id = lookup_named_face (f, Qtrailing_whitespace, 0);
|
||||
int face_id = lookup_named_face (f, Qtrailing_whitespace, false);
|
||||
if (face_id < 0)
|
||||
return;
|
||||
|
||||
@ -23642,7 +23642,7 @@ display_string (const char *string, Lisp_Object lisp_string, Lisp_Object face_st
|
||||
|
||||
it->face_id
|
||||
= face_at_string_position (it->w, face_string, face_string_pos,
|
||||
0, &endptr, it->base_face_id, 0);
|
||||
0, &endptr, it->base_face_id, false);
|
||||
face = FACE_FROM_ID (it->f, it->face_id);
|
||||
it->face_box_p = face->box != FACE_NO_BOX;
|
||||
}
|
||||
@ -26307,7 +26307,7 @@ calc_line_height_property (struct it *it, Lisp_Object val, struct font *font,
|
||||
int face_id;
|
||||
struct face *face;
|
||||
|
||||
face_id = lookup_named_face (it->f, face_name, 0);
|
||||
face_id = lookup_named_face (it->f, face_name, false);
|
||||
if (face_id < 0)
|
||||
return make_number (-1);
|
||||
|
||||
@ -29533,7 +29533,7 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y,
|
||||
charpos,
|
||||
0, &ignore,
|
||||
glyph->face_id,
|
||||
1);
|
||||
true);
|
||||
show_mouse_face (hlinfo, DRAW_MOUSE_FACE);
|
||||
|
||||
if (NILP (pointer))
|
||||
@ -29861,7 +29861,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
|
||||
hlinfo->mouse_face_window = window;
|
||||
hlinfo->mouse_face_face_id
|
||||
= face_at_string_position (w, object, pos, 0, &ignore,
|
||||
glyph->face_id, 1);
|
||||
glyph->face_id, true);
|
||||
show_mouse_face (hlinfo, DRAW_MOUSE_FACE);
|
||||
cursor = No_Cursor;
|
||||
}
|
||||
|
||||
522
src/xfaces.c
522
src/xfaces.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user