procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some flymake aliases

Browse source 
* lisp/progmodes/flymake-proc.el (flymake-xml-program)
(flymake-compilation-prevents-syntax-check, flymake-master-file-dirs)
(flymake-master-file-count-limit, flymake-allowed-file-name-masks):
* lisp/progmodes/flymake.el (flymake-start-syntax-check-on-find-file):
Define aliases to user options before the options are defined.
This commit is contained in:
Glenn Morris 2017-12-20 14:31:03 -05:00
parent 964dd38c8f
commit 79fb4b5438
2 changed files with 74 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lisp/progmodes/flymake-proc.el
View file

@ -43,11 +43,17 @@
(require 'flymake) (require 'flymake)
(define-obsolete-variable-alias 'flymake-compilation-prevents-syntax-check
'flymake-proc-compilation-prevents-syntax-check "26.1")
(defcustom flymake-proc-compilation-prevents-syntax-check t (defcustom flymake-proc-compilation-prevents-syntax-check t
"If non-nil, don't start syntax check if compilation is running." "If non-nil, don't start syntax check if compilation is running."
:group 'flymake :group 'flymake
:type 'boolean) :type 'boolean)
(define-obsolete-variable-alias 'flymake-xml-program
'flymake-proc-xml-program "26.1")
(defcustom flymake-proc-xml-program (defcustom flymake-proc-xml-program
(if (executable-find "xmlstarlet") "xmlstarlet" "xml") (if (executable-find "xmlstarlet") "xmlstarlet" "xml")
"Program to use for XML validation." "Program to use for XML validation."
@ -55,16 +61,25 @@
:group 'flymake :group 'flymake
:version "24.4") :version "24.4")
(define-obsolete-variable-alias 'flymake-master-file-dirs
'flymake-proc-master-file-dirs "26.1")
(defcustom flymake-proc-master-file-dirs '("." "./src" "./UnitTest") (defcustom flymake-proc-master-file-dirs '("." "./src" "./UnitTest")
"Dirs where to look for master files." "Dirs where to look for master files."
:group 'flymake :group 'flymake
:type '(repeat (string))) :type '(repeat (string)))
(define-obsolete-variable-alias 'flymake-master-file-count-limit
'flymake-proc-master-file-count-limit "26.1")
(defcustom flymake-proc-master-file-count-limit 32 (defcustom flymake-proc-master-file-count-limit 32
"Max number of master files to check." "Max number of master files to check."
:group 'flymake :group 'flymake
:type 'integer) :type 'integer)
(define-obsolete-variable-alias 'flymake-allowed-file-name-masks
'flymake-proc-allowed-file-name-masks "26.1")
(defcustom flymake-proc-allowed-file-name-masks (defcustom flymake-proc-allowed-file-name-masks
'(("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'" '(("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'"
flymake-proc-simple-make-init flymake-proc-simple-make-init
@ -1118,18 +1133,6 @@ Use CREATE-TEMP-F for creating temp copy."
;;;; ;;;;
(progn
(define-obsolete-variable-alias 'flymake-compilation-prevents-syntax-check
'flymake-proc-compilation-prevents-syntax-check "26.1")
(define-obsolete-variable-alias 'flymake-xml-program
'flymake-proc-xml-program "26.1")
(define-obsolete-variable-alias 'flymake-master-file-dirs
'flymake-proc-master-file-dirs "26.1")
(define-obsolete-variable-alias 'flymake-master-file-count-limit
'flymake-proc-master-file-count-limit "26.1"
"Max number of master files to check.")
(define-obsolete-variable-alias 'flymake-allowed-file-name-masks
'flymake-proc-allowed-file-name-masks "26.1")
(define-obsolete-variable-alias 'flymake-check-file-limit (define-obsolete-variable-alias 'flymake-check-file-limit
'flymake-proc-check-file-limit "26.1") 'flymake-proc-check-file-limit "26.1")
(define-obsolete-function-alias 'flymake-reformat-err-line-patterns-from-compile-el (define-obsolete-function-alias 'flymake-reformat-err-line-patterns-from-compile-el
@ -1185,9 +1188,7 @@ Use CREATE-TEMP-F for creating temp copy."
(define-obsolete-function-alias 'flymake-master-tex-init (define-obsolete-function-alias 'flymake-master-tex-init
'flymake-proc-master-tex-init "26.1") 'flymake-proc-master-tex-init "26.1")
(define-obsolete-function-alias 'flymake-xml-init (define-obsolete-function-alias 'flymake-xml-init
'flymake-proc-xml-init "26.1")) 'flymake-proc-xml-init "26.1")
(provide 'flymake-proc) (provide 'flymake-proc)
;;; flymake-proc.el ends here ;;; flymake-proc.el ends here

6
lisp/progmodes/flymake.el
View file

@ -124,15 +124,15 @@ If nil, never start checking buffer automatically like this."
(make-obsolete-variable 'flymake-gui-warnings-enabled (make-obsolete-variable 'flymake-gui-warnings-enabled
"it no longer has any effect." "26.1") "it no longer has any effect." "26.1")
(define-obsolete-variable-alias 'flymake-start-syntax-check-on-find-file
'flymake-start-on-flymake-mode "26.1")
(defcustom flymake-start-on-flymake-mode t (defcustom flymake-start-on-flymake-mode t
"Start syntax check when `flymake-mode' is enabled. "Start syntax check when `flymake-mode' is enabled.
Specifically, start it when the buffer is actually displayed." Specifically, start it when the buffer is actually displayed."
:version "26.1" :version "26.1"
:type 'boolean) :type 'boolean)
(define-obsolete-variable-alias 'flymake-start-syntax-check-on-find-file
'flymake-start-on-flymake-mode "26.1")
(defcustom flymake-log-level -1 (defcustom flymake-log-level -1
"Obsolete and ignored variable." "Obsolete and ignored variable."
:type 'integer) :type 'integer)