diff options
| author | Mark Oteiza <mvoteiza@udel.edu> | 2017-09-12 13:08:47 -0400 |
|---|---|---|
| committer | Mark Oteiza <mvoteiza@udel.edu> | 2017-09-12 13:18:10 -0400 |
| commit | 370d0e7aa7309b25fb9e974164261077b326e8e2 (patch) | |
| tree | 47b2bbce79feb9a889a06f67b650a892c95ccc4d /lisp/textmodes | |
| parent | 4612b2a2b37026bef5a9b8e92878a15dabb9b261 (diff) | |
| download | emacs-370d0e7aa7309b25fb9e974164261077b326e8e2.tar.gz | |
Update uses of if-let and when-let
* lisp/dom.el (dom-previous-sibling):
* lisp/emacs-lisp/package.el (package--with-work-buffer):
(package--sort-deps-in-alist, package--sort-by-dependence):
(package-install-from-archive, package-install):
(package-menu-execute, package-menu--populate-new-package-list):
* lisp/filenotify.el (file-notify--rm-descriptor):
(file-notify--event-watched-file, file-notify--event-file-name):
(file-notify--event-file1-name, file-notify-rm-watch):
(file-notify-valid-p):
* lisp/gnus/message.el (message-toggle-image-thumbnails):
* lisp/gnus/nnimap.el (nnimap-request-move-article):
* lisp/ibuf-ext.el (ibuffer-repair-saved-filters):
* lisp/mpc.el (mpc-format):
* lisp/net/eww.el (eww-tag-meta, eww-process-text-input):
(eww-save-history):
* lisp/net/shr.el (shr-tag-base, shr-tag-object, shr-make-table-1):
* lisp/progmodes/prog-mode.el (prettify-symbols--post-command-hook):
* lisp/svg.el (svg-remove):
* lisp/textmodes/css-mode.el (css--named-color):
(css--colon-inside-funcall):
* lisp/textmodes/sgml-mode.el (html-current-buffer-classes):
(html-current-buffer-ids): Use if-let* and when-let* instead.
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 1e49ca81fcc..44ba870662a 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -1045,7 +1045,7 @@ This function simply drops any transparency." "Check whether STR, seen at point, is CSS named color. Returns STR if it is a valid color. Special care is taken to exclude some SCSS constructs." - (when-let ((color (assoc str css--color-map))) + (when-let* ((color (assoc str css--color-map))) (save-excursion (goto-char start-point) (forward-comment (- (point))) @@ -1154,7 +1154,7 @@ for determining whether point is within a selector." (defun css--colon-inside-funcall () "Return t if point is inside a function call." - (when-let (opening-paren-pos (nth 1 (syntax-ppss))) + (when-let* ((opening-paren-pos (nth 1 (syntax-ppss)))) (save-excursion (goto-char opening-paren-pos) (eq (char-after) ?\()))) diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 1f99786ae7c..78fbbb59363 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -2242,8 +2242,8 @@ The result is cached in `html--buffer-classes-cache'." (classes (seq-mapcat (lambda (el) - (when-let (class-list - (cdr (assq 'class (dom-attributes el)))) + (when-let* ((class-list + (cdr (assq 'class (dom-attributes el))))) (split-string class-list))) (dom-by-class dom "")))) (setq-local html--buffer-classes-cache (cons tick classes)) @@ -2260,8 +2260,8 @@ The result is cached in `html--buffer-ids-cache'." (ids (seq-mapcat (lambda (el) - (when-let (id-list - (cdr (assq 'id (dom-attributes el)))) + (when-let* ((id-list + (cdr (assq 'id (dom-attributes el))))) (split-string id-list))) (dom-by-id dom "")))) (setq-local html--buffer-ids-cache (cons tick ids)) |