From e204df3c0548f6e7e9c3cdb97597a1942751c448 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 17 Apr 2017 02:19:20 -0400 Subject: [PATCH] Replace obsolete functions/commands --- modules/app/email/config.el | 1 - modules/app/present/config.el | 2 +- modules/feature/jump/autoload.el | 2 +- modules/feature/snippets/autoload/evil.el | 2 +- modules/feature/snippets/autoload/snippets.el | 4 ++-- modules/feature/workspaces/autoload/workspaces.el | 2 +- modules/lang/cc/config.el | 2 +- modules/lang/org/autoload/org.el | 4 ++-- modules/lang/web/autoload/css.el | 3 ++- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/app/email/config.el b/modules/app/email/config.el index 535c06f37..e8fc9c244 100644 --- a/modules/app/email/config.el +++ b/modules/app/email/config.el @@ -55,7 +55,6 @@ mu4e-view-show-addresses t mu4e-headers-skip-duplicates t ;; try to show images - mu4e-show-images t mu4e-view-show-images t mu4e-view-image-max-width 800 ;; rename files when moving (required for mbsync) diff --git a/modules/app/present/config.el b/modules/app/present/config.el index 904a232b6..57db508fd 100644 --- a/modules/app/present/config.el +++ b/modules/app/present/config.el @@ -79,7 +79,7 @@ (cond (org-tree-slide-mode (org-indent-mode -1) (text-scale-set +present-scale) - (ignore-errors (org-preview-latex-fragment '(4))) + (ignore-errors (org-toggle-latex-fragment '(4))) (set-face-attribute 'org-level-2 nil :height 1.4)) (t (org-indent-mode +1) diff --git a/modules/feature/jump/autoload.el b/modules/feature/jump/autoload.el index 9cf971ac7..2a0411206 100644 --- a/modules/feature/jump/autoload.el +++ b/modules/feature/jump/autoload.el @@ -44,6 +44,6 @@ (mapcar #'car +lookup-search-url-alist) nil t))) (let ((url (cdr (assoc where +lookup-search-url-alist))) - (search (or search (read-input "Query: ")))) + (search (or search (read-string "Query: ")))) (browse-url (format url (url-encode-url search))))) diff --git a/modules/feature/snippets/autoload/evil.el b/modules/feature/snippets/autoload/evil.el index 4783eddae..61f18f4a1 100644 --- a/modules/feature/snippets/autoload/evil.el +++ b/modules/feature/snippets/autoload/evil.el @@ -10,7 +10,7 @@ and switches to insert mode if there are editable fields." (cl-letf (((symbol-function 'region-beginning) (lambda () evil-visual-beginning)) ((symbol-function 'region-end) (lambda () evil-visual-end))) (yas-insert-snippet)) - (when-let (snippet (car-safe (yas--snippets-at-point))) + (when-let (snippet (car-safe (yas-active-snippets))) (let ((fields (yas--snippet-fields snippet))) (evil-insert-state +1) (unless fields (evil-change-state 'normal))))) diff --git a/modules/feature/snippets/autoload/snippets.el b/modules/feature/snippets/autoload/snippets.el index 4c3896778..25b71dc99 100644 --- a/modules/feature/snippets/autoload/snippets.el +++ b/modules/feature/snippets/autoload/snippets.el @@ -4,7 +4,7 @@ (defun +snippets/goto-start-of-field () "Go to the beginning of the current field." (interactive) - (let* ((snippet (car (yas--snippets-at-point))) + (let* ((snippet (car (yas-active-snippets))) (position (yas--field-start (yas--snippet-active-field snippet)))) (if (= (point) position) (move-beginning-of-line 1) @@ -14,7 +14,7 @@ (defun +snippets/goto-end-of-field () "Go to the end of the current field." (interactive) - (let* ((snippet (car (yas--snippets-at-point))) + (let* ((snippet (car (yas-active-snippets))) (position (yas--field-end (yas--snippet-active-field snippet)))) (if (= (point) position) (move-end-of-line 1) diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el index 8e7e74df6..5049daa7a 100644 --- a/modules/feature/workspaces/autoload/workspaces.el +++ b/modules/feature/workspaces/autoload/workspaces.el @@ -333,7 +333,7 @@ end of the workspace list." (condition-case ex (let* ((persps (+workspace-list)) (perspc (length persps)) - (index (position current-name persps))) + (index (cl-position current-name persps))) (when (= perspc 1) (user-error "No other workspaces")) (+workspace/switch-to (% (+ index n) perspc)) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 4c19ee1c5..e8a351f8b 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -41,7 +41,7 @@ (set! :company-backend '(c-mode c++-mode objc-mode) - #'(company-irony-c-headers company-irony)) + '(company-irony-c-headers company-irony)) (sp-with-modes '(c-mode c++-mode objc-mode java-mode) (sp-local-pair "<" ">" :when '(+cc-sp-point-is-template-p +cc-sp-point-after-include-p)) diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el index 3826cf980..0dcaab315 100644 --- a/modules/lang/org/autoload/org.el +++ b/modules/lang/org/autoload/org.el @@ -181,7 +181,7 @@ fragments, opening links, or refreshing images." ((eq type 'headline) (org-remove-latex-fragment-image-overlays) - (org-preview-latex-fragment '(4))) + (org-toggle-latex-fragment '(4))) ((eq type 'babel-call) (org-babel-lob-execute-maybe)) @@ -190,7 +190,7 @@ fragments, opening links, or refreshing images." (org-babel-execute-src-block)) ((memq type '(latex-fragment latex-environment)) - (org-preview-latex-fragment)) + (org-toggle-latex-fragment)) ((eq type 'link) (let ((path (org-element-property :path (org-element-lineage context '(link) t)))) diff --git a/modules/lang/web/autoload/css.el b/modules/lang/web/autoload/css.el index cf69234ba..dc5d15440 100644 --- a/modules/lang/web/autoload/css.el +++ b/modules/lang/web/autoload/css.el @@ -21,7 +21,8 @@ (goto-char (1+ beg)) (insert "\n") (unless (string-match ";[\s\t]*}$" (buffer-substring-no-properties beg (1+ end))) (goto-char end) (insert "\n")) - (replace-regexp ";[\s\t]*" ";\n" nil beg (1+ end)) + (while (re-search-forward ";[\s\t]*" (1+ end) t) + (replace-match ";\n" t t)) (setq end (cadr (evil-a-curly))) (evil-indent beg end) (delete-trailing-whitespace beg end))