aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/battery.el3
-rw-r--r--lisp/dired-aux.el2
-rw-r--r--lisp/net/zeroconf.el6
-rw-r--r--lisp/progmodes/hideshow.el2
-rw-r--r--lisp/progmodes/sql.el2
5 files changed, 10 insertions, 5 deletions
diff --git a/lisp/battery.el b/lisp/battery.el
index 71268e59ecd..b1834f06ff8 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -542,6 +542,9 @@ The following %-sequences are provided:
542 (t "N/A")))))) 542 (t "N/A"))))))
543 543
544 544
545(declare-function dbus-get-property "dbus.el"
546 (bus service path interface property))
547
545;;; `upowerd' interface. 548;;; `upowerd' interface.
546(defsubst battery-upower-prop (pname &optional device) 549(defsubst battery-upower-prop (pname &optional device)
547 (dbus-get-property 550 (dbus-get-property
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index cabcfcdbd3f..caa3b45705b 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -987,6 +987,8 @@ corresponding command.
987Within CMD, %i denotes the input file(s), and %o denotes the 987Within CMD, %i denotes the input file(s), and %o denotes the
988output file. %i path(s) are relative, while %o is absolute.") 988output file. %i path(s) are relative, while %o is absolute.")
989 989
990(declare-function format-spec "format-spec.el" (format specification))
991
990;;;###autoload 992;;;###autoload
991(defun dired-do-compress-to () 993(defun dired-do-compress-to ()
992 "Compress selected files and directories to an archive. 994 "Compress selected files and directories to an archive.
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index 37816bb8881..393f3a549f9 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -256,7 +256,7 @@ supported keys depend on the service type.")
256 "Returns all discovered Avahi service names as list." 256 "Returns all discovered Avahi service names as list."
257 (let (result) 257 (let (result)
258 (maphash 258 (maphash
259 (lambda (key value) (add-to-list 'result (zeroconf-service-name value))) 259 (lambda (_key value) (add-to-list 'result (zeroconf-service-name value)))
260 zeroconf-services-hash) 260 zeroconf-services-hash)
261 result)) 261 result))
262 262
@@ -264,7 +264,7 @@ supported keys depend on the service type.")
264 "Returns all discovered Avahi service types as list." 264 "Returns all discovered Avahi service types as list."
265 (let (result) 265 (let (result)
266 (maphash 266 (maphash
267 (lambda (key value) (add-to-list 'result (zeroconf-service-type value))) 267 (lambda (_key value) (add-to-list 'result (zeroconf-service-type value)))
268 zeroconf-services-hash) 268 zeroconf-services-hash)
269 result)) 269 result))
270 270
@@ -276,7 +276,7 @@ The service type is one of the returned values of
276format of SERVICE." 276format of SERVICE."
277 (let (result) 277 (let (result)
278 (maphash 278 (maphash
279 (lambda (key value) 279 (lambda (_key value)
280 (when (equal type (zeroconf-service-type value)) 280 (when (equal type (zeroconf-service-type value))
281 (add-to-list 'result value))) 281 (add-to-list 'result value)))
282 zeroconf-services-hash) 282 zeroconf-services-hash)
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 0e4e67018ed..5328526abd9 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -582,7 +582,7 @@ and then further adjusted to be at the end of the line."
582 (setq p (line-end-position))) 582 (setq p (line-end-position)))
583 ;; `q' is the point at the end of the block 583 ;; `q' is the point at the end of the block
584 (hs-forward-sexp mdata 1) 584 (hs-forward-sexp mdata 1)
585 (setq q (if (looking-back hs-block-end-regexp) 585 (setq q (if (looking-back hs-block-end-regexp nil)
586 (match-beginning 0) 586 (match-beginning 0)
587 (point))) 587 (point)))
588 (when (and (< p q) (> (count-lines p q) 1)) 588 (when (and (< p q) (> (count-lines p q) 1))
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 71563486ecd..88683431290 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2790,7 +2790,7 @@ local variable."
2790 ;; Iterate until we've moved the desired number of stmt ends 2790 ;; Iterate until we've moved the desired number of stmt ends
2791 (while (not (= (cl-signum arg) 0)) 2791 (while (not (= (cl-signum arg) 0))
2792 ;; if we're looking at the terminator, jump by 2 2792 ;; if we're looking at the terminator, jump by 2
2793 (if (or (and (> 0 arg) (looking-back term)) 2793 (if (or (and (> 0 arg) (looking-back term nil))
2794 (and (< 0 arg) (looking-at term))) 2794 (and (< 0 arg) (looking-at term)))
2795 (setq n 2) 2795 (setq n 2)
2796 (setq n 1)) 2796 (setq n 1))