0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-30 13:07:47 +00:00

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-04-20 08:44:33 +02:00
commit abd8e52dc0

View file

@ -9258,10 +9258,9 @@ definitions."
(string-match (cdr rr) (symbol-name major-mode)))
(and (eq (car rr) 'in-buffer)
(string-match (cdr rr) (buffer-name)))
(if (and (eq (car rr) 'not-in-file)
(when (and (eq (car rr) 'not-in-file)
(buffer-file-name))
(not (string-match (cdr rr) (buffer-file-name)))
t)
(not (string-match (cdr rr) (buffer-file-name))))
(when (eq (car rr) 'not-in-mode)
(not (string-match (cdr rr) (symbol-name major-mode))))
(when (eq (car rr) 'not-in-buffer)