diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2018-08-21 13:44:03 -0700 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2019-01-13 12:43:04 -0500 |
commit | 28d2c81709d374c601c08c7a44065240f57843d3 (patch) | |
tree | 41341162d42215829ba9eded614bef29abe9868a | |
parent | da31714c10f67a0c7250b98eb41a395398e45ddd (diff) | |
download | org-mode-28d2c81709d374c601c08c7a44065240f57843d3.tar.gz |
Backport commit f18af6cd5 from Emacs
* lisp/org.el:
* lisp/ox-publish.el:
Prefer ash to lsh when either will do.
Audit use of lsh and fix glitches
f18af6cd5cb7dbbf7420ec2d3efed4e202c4f0dd
Paul Eggert
Tue Aug 21 13:44:32 2018 -0700
-rw-r--r-- | lisp/org.el | 2 | ||||
-rw-r--r-- | lisp/ox-publish.el | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index 5bb1e50..450659e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9643,7 +9643,7 @@ Note: this function also decodes single byte encodings like (cons 6 128)))) (when (>= val 192) (setq eat (car shift-xor))) (setq val (logxor val (cdr shift-xor))) - (setq sum (+ (lsh sum (car shift-xor)) val)) + (setq sum (+ (ash sum (car shift-xor)) val)) (when (> eat 0) (setq eat (- eat 1))) (cond ((= 0 eat) ;multi byte diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index 1ef9031..9da7d3a 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -794,8 +794,8 @@ Default for SITEMAP-FILENAME is `sitemap.org'." ((or `anti-chronologically `chronologically) (let* ((adate (org-publish-find-date a project)) (bdate (org-publish-find-date b project)) - (A (+ (lsh (car adate) 16) (cadr adate))) - (B (+ (lsh (car bdate) 16) (cadr bdate)))) + (A (+ (ash (car adate) 16) (cadr adate))) + (B (+ (ash (car bdate) 16) (cadr bdate)))) (setq retval (if (eq sort-files 'chronologically) (<= A B) @@ -1364,7 +1364,7 @@ does not exist." (expand-file-name (or (file-symlink-p file) file) (file-name-directory file))))) (if (not attr) (error "No such file: \"%s\"" file) - (+ (lsh (car (nth 5 attr)) 16) + (+ (ash (car (nth 5 attr)) 16) (cadr (nth 5 attr)))))) |