Upgrade markdown-mode rust-mode and yaml-mode. Remove PHP mode.

1 files changed, 18 insertions, 18 deletions

diff --git a/.emacs.d/lisp/yaml-mode.el b/.emacs.d/lisp/yaml-mode.el
index 1bfa43b..dad0380 100644
--- a/.emacs.d/lisp/yaml-mode.el
+++ b/.emacs.d/lisp/yaml-mode.el
@@ -78,7 +78,7 @@
 (defcustom yaml-indent-offset 2
   "*Amount of offset per level of indentation."
   :type 'integer
-  :safe 'natnump
+  :safe #'natnump
   :group 'yaml)
 
 (defcustom yaml-backspace-function 'backward-delete-char-untabify
@@ -186,11 +186,11 @@ that key is pressed to begin a block literal."
 
 (defvar yaml-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map "|" 'yaml-electric-bar-and-angle)
-    (define-key map ">" 'yaml-electric-bar-and-angle)
-    (define-key map "-" 'yaml-electric-dash-and-dot)
-    (define-key map "." 'yaml-electric-dash-and-dot)
-    (define-key map (kbd "DEL") 'yaml-electric-backspace)
+    (define-key map "|" #'yaml-electric-bar-and-angle)
+    (define-key map ">" #'yaml-electric-bar-and-angle)
+    (define-key map "-" #'yaml-electric-dash-and-dot)
+    (define-key map "." #'yaml-electric-dash-and-dot)
+    (define-key map (kbd "DEL") #'yaml-electric-backspace)
     map)
   "Keymap used in `yaml-mode' buffers.")
 
@@ -216,20 +216,18 @@ that key is pressed to begin a block literal."
 
 ;;;###autoload
 (define-derived-mode yaml-mode text-mode "YAML"
-  "Simple mode to edit YAML.
-
-\\{yaml-mode-map}"
-  :syntax-table yaml-mode-syntax-table
+  "Simple mode to edit YAML."
+  (setq-local electric-indent-inhibit t) ;We can't *re*indent reliably.
   (set (make-local-variable 'comment-start) "# ")
   (set (make-local-variable 'comment-start-skip) "#+ *")
   (set (make-local-variable 'comment-end) "")
-  (set (make-local-variable 'indent-line-function) 'yaml-indent-line)
+  (set (make-local-variable 'indent-line-function) #'yaml-indent-line)
   (set (make-local-variable 'indent-tabs-mode) nil)
-  (set (make-local-variable 'fill-paragraph-function) 'yaml-fill-paragraph)
+  (set (make-local-variable 'fill-paragraph-function) #'yaml-fill-paragraph)
   (set (make-local-variable 'page-delimiter) "^---\\([ \t].*\\)*\n")
 
   (set (make-local-variable 'syntax-propertize-function)
-       'yaml-mode-syntax-propertize-function)
+       #'yaml-mode-syntax-propertize-function)
   (setq font-lock-defaults '(yaml-font-lock-keywords)))
 
 
@@ -459,6 +457,7 @@ Outside of comments, this behaves as `fill-paragraph' except that
 filling does not cross boundaries of block literals.  Inside comments,
 this will do usual adaptive fill behaviors."
   (interactive "*P")
+  ;; FIXME: Can we get away with setting only `fill-forward-paragraph-function'?
   (save-restriction
     (yaml-narrow-to-block-literal)
     (let ((fill-paragraph-function nil))
@@ -466,12 +465,13 @@ this will do usual adaptive fill behaviors."
           (fill-paragraph justify region)))))
 
 (defun yaml-set-imenu-generic-expression ()
-  (make-local-variable 'imenu-generic-expression)
-  (make-local-variable 'imenu-create-index-function)
-  (setq imenu-create-index-function 'imenu-default-create-index-function)
-  (setq imenu-generic-expression yaml-imenu-generic-expression))
+  ;; FIXME: Why set this var to its default value?
+  (setq-local imenu-create-index-function #'imenu-default-create-index-function)
+  (setq-local imenu-generic-expression yaml-imenu-generic-expression))
 
-(add-hook 'yaml-mode-hook 'yaml-set-imenu-generic-expression)
+;; FIXME: Why not inline `yaml-set-imenu-generic-expression' into the
+;; major mode function?
+(add-hook 'yaml-mode-hook #'yaml-set-imenu-generic-expression)
 
 
 (defun yaml-mode-version ()