mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
6e4bceb8ce
* lisp/vc/vc-git.el (vc-git--current-branch): Rename to ... (vc-git-working-branch): ... this. All uses changed. (vc-git-trunk-or-topic-p, vc-git-topic-outgoing-base): * lisp/vc/vc-hg.el (vc-hg--working-branch, vc-hg-working-branch) (vc-hg-trunk-or-topic-p, vc-hg-topic-outgoing-base): * lisp/vc/vc-hooks.el (vc--safe-branch-regexps-p): * lisp/vc/vc.el (vc-default-working-branch) (vc-default-trunk-or-topic-p, vc--match-branch-name-regexps) (vc--outgoing-base, vc--outgoing-base-mergebase) (vc--maybe-read-outgoing-base): New functions. (vc-diff-outgoing-base): Call vc--outgoing-base-mergebase. (vc-root-diff-outgoing-base, vc-diff-outgoing-base): Use vc--maybe-read-outgoing-base in interactive specification. (working-branch, trunk-or-topic-p, topic-outgoing-base): New specifications for backend functions. (vc-trunk-branch-regexps, vc-topic-branch-regexps): New variables. * .dir-locals.el: Commented entries for the new variables. * test/lisp/vc/vc-tests/vc-test-misc.el (vc-test-match-branch-name-regexps): New test. * doc/emacs/vc1-xtra.texi (Outstanding Changes): Document the new functionality.
61 lines
2.9 KiB
EmacsLisp
61 lines
2.9 KiB
EmacsLisp
;;; Directory Local Variables -*- no-byte-compile: t; -*-
|
|
;;; For more information see (info "(emacs) Directory Variables")
|
|
|
|
((nil . ((tab-width . 8)
|
|
(sentence-end-double-space . t)
|
|
(fill-column . 72)
|
|
(emacs-lisp-docstring-fill-column . 72)
|
|
(vc-git-annotate-switches . "-w")
|
|
(bug-reference-url-format . "https://debbugs.gnu.org/%s")
|
|
(diff-add-log-use-relative-names . t)
|
|
(etags-regen-regexp-alist
|
|
.
|
|
((("c" "objc") .
|
|
("/[ \t]*DEFVAR_[A-Z_ \t(]+\"\\([^\"]+\\)\"/\\1/"
|
|
"/[ \t]*DEFVAR_[A-Z_ \t(]+\"[^\"]+\",[ \t]\\([A-Za-z0-9_]+\\)/\\1/"))))
|
|
(etags-regen-ignores . ("test/manual/etags/"))
|
|
(vc-prepare-patches-separately . nil)
|
|
(vc-default-patch-addressee . "bug-gnu-emacs@gnu.org")
|
|
;; Uncomment these later once people's builds are likely to know
|
|
;; they're safe local variable values.
|
|
;; (vc-trunk-branch-regexps . ("master" "\\`emacs-[0-9]+\\'"))
|
|
;; (vc-topic-branch-regexps . ("\\`feature/"))
|
|
))
|
|
(c-mode . ((c-file-style . "GNU")
|
|
(c-noise-macro-names . ("INLINE" "NO_INLINE" "ATTRIBUTE_NO_SANITIZE_UNDEFINED"
|
|
"ATTRIBUTE_NO_SANITIZE_ADDRESS"
|
|
"UNINIT" "CALLBACK" "ALIGN_STACK" "ATTRIBUTE_MALLOC"
|
|
"ATTRIBUTE_DEALLOC_FREE" "ANDROID_EXPORT" "TEST_STATIC"
|
|
"INLINE_HEADER_BEGIN" "INLINE_HEADER_END"))
|
|
(electric-quote-comment . nil)
|
|
(electric-quote-string . nil)
|
|
(indent-tabs-mode . t)
|
|
(mode . bug-reference-prog)))
|
|
(java-mode . ((c-file-style . "GNU")
|
|
(electric-quote-comment . nil)
|
|
(electric-quote-string . nil)
|
|
(indent-tabs-mode . t)
|
|
(mode . bug-reference-prog)))
|
|
(objc-mode . ((c-file-style . "GNU")
|
|
(electric-quote-comment . nil)
|
|
(electric-quote-string . nil)
|
|
(indent-tabs-mode . t)
|
|
(mode . bug-reference-prog)))
|
|
(c-ts-mode . ((c-ts-mode-indent-style . gnu))) ;Inherits `c-mode' settings.
|
|
(log-edit-mode . ((log-edit-font-lock-gnu-style . t)
|
|
(log-edit-setup-add-author . t)
|
|
(vc-git-log-edit-summary-target-len . 50)
|
|
(fill-column . 64)))
|
|
(change-log-mode . ((add-log-time-zone-rule . t)
|
|
(fill-column . 74)
|
|
(mode . bug-reference)))
|
|
(diff-mode . ((mode . whitespace)))
|
|
(emacs-lisp-mode . ((indent-tabs-mode . nil)
|
|
(electric-quote-comment . nil)
|
|
(electric-quote-string . nil)
|
|
(mode . bug-reference-prog)))
|
|
(lisp-data-mode . ((indent-tabs-mode . nil)))
|
|
(texinfo-mode . ((electric-quote-comment . nil)
|
|
(electric-quote-string . nil)
|
|
(mode . bug-reference-prog)))
|
|
(outline-mode . ((mode . bug-reference))))
|