about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-12 03:36:53 -0700
committerbors <bors@rust-lang.org>2014-05-12 03:36:53 -0700
commitedae0bdabf75b6acf4f0f0eb5bc2bd3b29d58b81 (patch)
treecf830f5e5aa0039f00ae3eb7022b5037f8e4843f
parent0550b79f73996b69e7f3540fc365b7e49455ca75 (diff)
parent77c56f7cebaedb8e98e8002351f21137b4c61636 (diff)
downloadrust-edae0bdabf75b6acf4f0f0eb5bc2bd3b29d58b81.tar.gz
rust-edae0bdabf75b6acf4f0f0eb5bc2bd3b29d58b81.zip
auto merge of #13922 : Rufflewind/rust/patch-1, r=pnkfelix
Since rust-top-item-beg-re hasn't been defined yet, using defvar instead of
setq is more appropriate here (and also silences compilation warnings).
-rw-r--r--src/etc/emacs/rust-mode.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el
index 580e5f89cd4..f9142cd1276 100644
--- a/src/etc/emacs/rust-mode.el
+++ b/src/etc/emacs/rust-mode.el
@@ -380,11 +380,11 @@ idomenu (imenu with `ido-mode') for best mileage.")
 ;;; Defun Motions
 
 ;;; Start of a Rust item
-(setq rust-top-item-beg-re
-      (concat "^\\s-*\\(?:priv\\|pub\\)?\\s-*"
-              (regexp-opt
-               '("enum" "struct" "type" "mod" "use" "fn" "static" "impl"
-                 "extern" "impl" "static" "trait"))))
+(defvar rust-top-item-beg-re
+  (concat "^\\s-*\\(?:priv\\|pub\\)?\\s-*"
+          (regexp-opt
+           '("enum" "struct" "type" "mod" "use" "fn" "static" "impl"
+             "extern" "impl" "static" "trait"))))
 
 (defun rust-beginning-of-defun (&optional arg)
   "Move backward to the beginning of the current defun.