diff options
author | Michael Heerdegen <michael_heerdegen@web.de> | 2018-11-05 01:22:15 +0100 |
---|---|---|
committer | Michael Heerdegen <michael_heerdegen@web.de> | 2018-11-25 21:08:08 +0100 |
commit | 1808d254a5820e8c650013033f800ca2990cd239 (patch) | |
tree | dfb19b6117a4781351b17d35b9c404ea16d6e0bf /lisp/org/org-clock.el | |
parent | 3826ecc795ec2fc11d82432e1b55818c0e2ef685 (diff) | |
download | emacs-1808d254a5820e8c650013033f800ca2990cd239.tar.gz emacs-1808d254a5820e8c650013033f800ca2990cd239.tar.bz2 emacs-1808d254a5820e8c650013033f800ca2990cd239.zip |
Replace insignificant backquotes
Replace most insignificant occurrences of '`' with a straight quote,
sharp quote or nothing. This includes backquotes in 'pcase' patterns.
* admin/admin.el:
* lisp/apropos.el:
* lisp/arc-mode.el:
* lisp/auth-source.el:
* lisp/avoid.el:
* lisp/bindings.el:
* lisp/bs.el:
* lisp/calculator.el:
* lisp/calendar/todo-mode.el:
* lisp/cedet/semantic.el:
* lisp/cedet/semantic/analyze/debug.el:
* lisp/cedet/semantic/bovine.el:
* lisp/cedet/semantic/dep.el:
* lisp/cedet/semantic/grammar.el:
* lisp/cedet/semantic/wisent/comp.el:
* lisp/cedet/semantic/wisent/grammar.el:
* lisp/cedet/srecode/mode.el:
* lisp/cus-edit.el:
* lisp/doc-view.el:
* lisp/elec-pair.el:
* lisp/electric.el:
* lisp/emacs-lisp/autoload.el:
* lisp/emacs-lisp/benchmark.el:
* lisp/emacs-lisp/byte-opt.el:
* lisp/emacs-lisp/bytecomp.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/cl-extra.el:
* lisp/emacs-lisp/cl-generic.el:
* lisp/emacs-lisp/cl-macs.el:
* lisp/emacs-lisp/copyright.el:
* lisp/emacs-lisp/debug.el:
* lisp/emacs-lisp/eieio-compat.el:
* lisp/emacs-lisp/ert.el:
* lisp/emacs-lisp/generator.el:
* lisp/emacs-lisp/inline.el:
* lisp/emacs-lisp/macroexp.el:
* lisp/emacs-lisp/map.el:
* lisp/emacs-lisp/package-x.el:
* lisp/emacs-lisp/package.el:
* lisp/emacs-lisp/radix-tree.el:
* lisp/emacs-lisp/smie.el:
* lisp/epa.el:
* lisp/erc/erc-dcc.el:
* lisp/erc/erc-track.el:
* lisp/erc/erc.el:
* lisp/eshell/em-ls.el:
* lisp/eshell/esh-cmd.el:
* lisp/files.el:
* lisp/filesets.el:
* lisp/font-lock.el:
* lisp/frameset.el:
* lisp/gnus/gnus-agent.el:
* lisp/gnus/gnus-art.el:
* lisp/gnus/gnus-cite.el:
* lisp/gnus/gnus-group.el:
* lisp/gnus/gnus-msg.el:
* lisp/gnus/gnus-salt.el:
* lisp/gnus/gnus-srvr.el:
* lisp/gnus/gnus-sum.el:
* lisp/gnus/gnus-topic.el:
* lisp/gnus/gnus-util.el:
* lisp/gnus/gnus.el:
* lisp/gnus/message.el:
* lisp/gnus/mm-util.el:
* lisp/gnus/mml.el:
* lisp/gnus/nnheader.el:
* lisp/gnus/nnimap.el:
* lisp/gnus/nnmairix.el:
* lisp/gnus/spam.el:
* lisp/hexl.el:
* lisp/hi-lock.el:
* lisp/ibuf-ext.el:
* lisp/ibuffer.el:
* lisp/ido.el:
* lisp/info.el:
* lisp/international/mule-cmds.el:
* lisp/international/mule-util.el:
* lisp/json.el:
* lisp/jsonrpc.el:
* lisp/language/cyrillic.el:
* lisp/language/european.el:
* lisp/language/georgian.el:
* lisp/language/tibetan.el:
* lisp/language/utf-8-lang.el:
* lisp/language/vietnamese.el:
* lisp/ldefs-boot.el:
* lisp/mail/mail-extr.el:
* lisp/man.el:
* lisp/menu-bar.el:
* lisp/mh-e/mh-acros.el:
* lisp/mh-e/mh-folder.el:
* lisp/mh-e/mh-mime.el:
* lisp/mh-e/mh-show.el:
* lisp/mh-e/mh-speed.el:
* lisp/minibuffer.el:
* lisp/mpc.el:
* lisp/net/ange-ftp.el:
* lisp/net/hmac-def.el:
* lisp/net/newst-backend.el:
* lisp/net/quickurl.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-compat.el:
* lisp/notifications.el:
* lisp/obsolete/pgg-parse.el:
* lisp/obsolete/vc-arch.el:
* lisp/obsolete/xesam.el:
* lisp/org/ob-C.el:
* lisp/org/ob-core.el:
* lisp/org/ob-exp.el:
* lisp/org/ob-groovy.el:
* lisp/org/ob-haskell.el:
* lisp/org/ob-io.el:
* lisp/org/ob-lisp.el:
* lisp/org/ob-lob.el:
* lisp/org/ob-lua.el:
* lisp/org/ob-octave.el:
* lisp/org/ob-perl.el:
* lisp/org/ob-python.el:
* lisp/org/ob-ref.el:
* lisp/org/ob-ruby.el:
* lisp/org/ob-sql.el:
* lisp/org/org-agenda.el:
* lisp/org/org-capture.el:
* lisp/org/org-clock.el:
* lisp/org/org-colview.el:
* lisp/org/org-duration.el:
* lisp/org/org-element.el:
* lisp/org/org-entities.el:
* lisp/org/org-gnus.el:
* lisp/org/org-indent.el:
* lisp/org/org-info.el:
* lisp/org/org-inlinetask.el:
* lisp/org/org-lint.el:
* lisp/org/org-list.el:
* lisp/org/org-mouse.el:
* lisp/org/org-plot.el:
* lisp/org/org-src.el:
* lisp/org/org-table.el:
* lisp/org/org.el:
* lisp/org/ox-ascii.el:
* lisp/org/ox-html.el:
* lisp/org/ox-latex.el:
* lisp/org/ox-man.el:
* lisp/org/ox-md.el:
* lisp/org/ox-org.el:
* lisp/org/ox-publish.el:
* lisp/org/ox-texinfo.el:
* lisp/org/ox.el:
* lisp/play/bubbles.el:
* lisp/play/gamegrid.el:
* lisp/progmodes/autoconf.el:
* lisp/progmodes/cc-defs.el:
* lisp/progmodes/cc-engine.el:
* lisp/progmodes/cc-fonts.el:
* lisp/progmodes/cc-langs.el:
* lisp/progmodes/cperl-mode.el:
* lisp/progmodes/ebrowse.el:
* lisp/progmodes/elisp-mode.el:
* lisp/progmodes/flymake-cc.el:
* lisp/progmodes/flymake.el:
* lisp/progmodes/fortran.el:
* lisp/progmodes/grep.el:
* lisp/progmodes/gud.el:
* lisp/progmodes/idlwave.el:
* lisp/progmodes/js.el:
* lisp/progmodes/m4-mode.el:
* lisp/progmodes/make-mode.el:
* lisp/progmodes/mixal-mode.el:
* lisp/progmodes/modula2.el:
* lisp/progmodes/octave.el:
* lisp/progmodes/opascal.el:
* lisp/progmodes/prolog.el:
* lisp/progmodes/ps-mode.el:
* lisp/progmodes/python.el:
* lisp/progmodes/ruby-mode.el:
* lisp/progmodes/sh-script.el:
* lisp/progmodes/sql.el:
* lisp/progmodes/verilog-mode.el:
* lisp/ps-mule.el:
* lisp/rtree.el:
* lisp/ruler-mode.el:
* lisp/ses.el:
* lisp/simple.el:
* lisp/startup.el:
* lisp/subr.el:
* lisp/term/ns-win.el:
* lisp/textmodes/bibtex.el:
* lisp/textmodes/conf-mode.el:
* lisp/textmodes/css-mode.el:
* lisp/textmodes/refill.el:
* lisp/textmodes/sgml-mode.el:
* lisp/textmodes/tex-mode.el:
* lisp/tutorial.el:
* lisp/url/url-dav.el:
* lisp/url/url-gw.el:
* lisp/url/url-http.el:
* lisp/url/url-methods.el:
* lisp/url/url-privacy.el:
* lisp/vc/cvs-status.el:
* lisp/vc/diff-mode.el:
* lisp/vc/ediff-init.el:
* lisp/vc/ediff-ptch.el:
* lisp/vc/log-edit.el:
* lisp/vc/log-view.el:
* lisp/vc/pcvs-info.el:
* lisp/vc/pcvs.el:
* lisp/vc/smerge-mode.el:
* lisp/vc/vc-git.el:
* lisp/vc/vc-hg.el:
* lisp/vc/vc-mtn.el:
* lisp/vc/vc-rcs.el:
* lisp/whitespace.el:
* lisp/window.el:
* test/lisp/electric-tests.el:
* test/lisp/emacs-lisp/cl-lib-tests.el:
* test/lisp/emacs-lisp/ert-tests.el:
* test/lisp/epg-tests.el:
* test/lisp/jsonrpc-tests.el:
* test/src/data-tests.el:
* test/src/json-tests.el: Replace most insignificant backquotes.
Diffstat (limited to 'lisp/org/org-clock.el')
-rw-r--r-- | lisp/org/org-clock.el | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index 9be0d5bc1ff..0940c121473 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -1692,11 +1692,11 @@ Optional argument N tells to change by that many units." (org-timestamp-change (round (/ (float-time tdiff) (pcase timestamp? - (`minute 60) - (`hour 3600) - (`day (* 24 3600)) - (`month (* 24 3600 31)) - (`year (* 24 3600 365.2))))) + ('minute 60) + ('hour 3600) + ('day (* 24 3600)) + ('month (* 24 3600 31)) + ('year (* 24 3600 365.2))))) timestamp? 'updown))))))) ;;;###autoload @@ -2045,7 +2045,7 @@ in the buffer and update it." (org-find-dblock "clocktable") (org-show-entry)) (pcase (org-in-clocktable-p) - (`nil + ('nil (org-create-dblock (org-combine-plists (list :scope (if (org-before-first-heading-p) 'file 'subtree)) @@ -2194,21 +2194,21 @@ have priority." (error "Looking forward with quarters isn't implemented")))) (when (= shift 0) (pcase key - (`yesterday (setq key 'today shift -1)) - (`lastweek (setq key 'week shift -1)) - (`lastmonth (setq key 'month shift -1)) - (`lastyear (setq key 'year shift -1)) - (`lastq (setq key 'quarter shift -1)))) + ('yesterday (setq key 'today shift -1)) + ('lastweek (setq key 'week shift -1)) + ('lastmonth (setq key 'month shift -1)) + ('lastyear (setq key 'year shift -1)) + ('lastq (setq key 'quarter shift -1)))) ;; Prepare start and end times depending on KEY's type. (pcase key - ((or `day `today) (setq m 0 h 0 h1 24 d (+ d shift))) - ((or `week `thisweek) + ((or 'day 'today) (setq m 0 h 0 h1 24 d (+ d shift))) + ((or 'week 'thisweek) (let* ((ws (or wstart 1)) (diff (+ (* -7 shift) (if (= dow 0) (- 7 ws) (- dow ws))))) (setq m 0 h 0 d (- d diff) d1 (+ 7 d)))) - ((or `month `thismonth) + ((or 'month 'thismonth) (setq h 0 m 0 d (or mstart 1) month (+ month shift) month1 (1+ month))) - ((or `quarter `thisq) + ((or 'quarter 'thisq) ;; Compute if this shift remains in this year. If not, compute ;; how many years and quarters we have to shift (via floor*) and ;; compute the shifted years, months and quarters. @@ -2231,13 +2231,13 @@ have priority." (setq shiftedy y) (let ((qshift (* 3 (1- (+ q shift))))) (setq m 0 h 0 d 1 month (+ 1 qshift) month1 (+ 4 qshift)))))) - ((or `year `thisyear) + ((or 'year 'thisyear) (setq m 0 h 0 d 1 month 1 y (+ y shift) y1 (1+ y))) - ((or `interactive `untilnow)) ; Special cases, ignore them. + ((or 'interactive 'untilnow)) ; Special cases, ignore them. (_ (user-error "No such time block %s" key))) ;; Format start and end times according to AS-STRINGS. (let* ((start (pcase key - (`interactive (org-read-date nil t nil "Range start? ")) + ('interactive (org-read-date nil t nil "Range start? ")) ;; In theory, all clocks started after the dawn of ;; humanity. However, the platform's clock ;; support might not go back that far. Choose the @@ -2246,15 +2246,15 @@ have priority." ;; that works, otherwise 0 (1970). Going back ;; billions of years would loop forever on Mac OS ;; X 10.6 with Emacs 26 and earlier (Bug#27736). - (`untilnow + ('untilnow (let ((old 0)) (dolist (older '((-32768 0) (-33554432 0)) old) (when (ignore-errors (decode-time older)) (setq old older))))) (_ (encode-time 0 m h d month y)))) (end (pcase key - (`interactive (org-read-date nil t nil "Range end? ")) - (`untilnow (current-time)) + ('interactive (org-read-date nil t nil "Range end? ")) + ('untilnow (current-time)) (_ (encode-time 0 (or m1 m) (or h1 h) @@ -2263,15 +2263,15 @@ have priority." (or y1 y))))) (text (pcase key - ((or `day `today) (format-time-string "%A, %B %d, %Y" start)) - ((or `week `thisweek) (format-time-string "week %G-W%V" start)) - ((or `month `thismonth) (format-time-string "%B %Y" start)) - ((or `year `thisyear) (format-time-string "the year %Y" start)) - ((or `quarter `thisq) + ((or 'day 'today) (format-time-string "%A, %B %d, %Y" start)) + ((or 'week 'thisweek) (format-time-string "week %G-W%V" start)) + ((or 'month 'thismonth) (format-time-string "%B %Y" start)) + ((or 'year 'thisyear) (format-time-string "the year %Y" start)) + ((or 'quarter 'thisq) (concat (org-count-quarter shiftedq) " quarter of " (number-to-string shiftedy))) - (`interactive "(Range interactively set)") - (`untilnow "now")))) + ('interactive "(Range interactively set)") + ('untilnow "now")))) (if (not as-strings) (list start end text) (let ((f (cdr org-time-stamp-formats))) (list (format-time-string f start) @@ -2375,11 +2375,11 @@ the currently selected interval size." (catch 'exit (let* ((scope (plist-get params :scope)) (files (pcase scope - (`agenda + ('agenda (org-agenda-files t)) - (`agenda-with-archives + ('agenda-with-archives (org-add-archive-files (org-agenda-files t))) - (`file-with-archives + ('file-with-archives (and buffer-file-name (org-add-archive-files (list buffer-file-name)))) ((pred functionp) (funcall scope)) @@ -2502,7 +2502,7 @@ from the dynamic block definition." (setq narrow (intern (format "%d!" narrow)))) (pcase narrow - ((or `nil (pred integerp)) nil) ;nothing to do + ((or 'nil (pred integerp)) nil) ;nothing to do ((and (pred symbolp) (guard (string-match-p "\\`[0-9]+!\\'" (symbol-name narrow)))) (setq narrow-cut-p t) |