summaryrefslogtreecommitdiff
path: root/lisp/ess-r-syntax.el
diff options
context:
space:
mode:
authorAlex Branham <branham@utexas.edu>2018-07-24 11:03:08 -0500
committerVitalie Spinu <spinuvit@gmail.com>2018-07-25 20:29:59 +0200
commitd6d2604364c176234f3391ffa3ff800cc63f27a8 (patch)
tree469503c58c7dd28774b93f12bab239e4d5484a55 /lisp/ess-r-syntax.el
parent6f06460f49268dbfc1e3b5e701375d7424ecd5f5 (diff)
Fix many compiler warnings
Move some variables and functions to satisfy the byte compiler Some get moved further up in the file (e.g. ess-sas-local-unix-keys), and others get moved to a new file Remove calls to easy-menu-add (it's a holdover from XEmacs). Closes #612
Diffstat (limited to 'lisp/ess-r-syntax.el')
-rw-r--r--lisp/ess-r-syntax.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ess-r-syntax.el b/lisp/ess-r-syntax.el
index e3605cd..306c1e6 100644
--- a/lisp/ess-r-syntax.el
+++ b/lisp/ess-r-syntax.el
@@ -187,6 +187,12 @@ Cons cell containing the token type and string representation."
(list (ess-token--cons token-type token-value)
(cons (point) token-end)))))
+(defsubst ess-climb-token--char (&rest chars)
+ (ess-while (and chars
+ (eq (char-before) (car chars))
+ (ess-backward-char))
+ (setq chars (cdr chars))))
+
;; Difficult to use regexps here because we want to match greedily
;; backward
(defun ess-climb-token--operator ()
@@ -218,12 +224,6 @@ Cons cell containing the token type and string representation."
(ess-climb-token--char ?: ?:))))
'self))
-(defsubst ess-climb-token--char (&rest chars)
- (ess-while (and chars
- (eq (char-before) (car chars))
- (ess-backward-char))
- (setq chars (cdr chars))))
-
(defun ess-climb-token--back-and-forth ()
(let ((limit (point)))
(when (ess-skip-token-backward)