diff options
| -rw-r--r-- | lisp/textmodes/tildify.el | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index cf33d44ed3c..ccbc2b086c6 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el | |||
| @@ -261,7 +261,9 @@ Call CALLBACK on each region outside of environment to ignore. Stop scanning | |||
| 261 | the region as soon as CALLBACK returns nil. Environments to ignore are | 261 | the region as soon as CALLBACK returns nil. Environments to ignore are |
| 262 | defined by deprecated `tildify-ignored-environments-alist'. CALLBACK may be | 262 | defined by deprecated `tildify-ignored-environments-alist'. CALLBACK may be |
| 263 | called on portions of the buffer outside of [BEG END)." | 263 | called on portions of the buffer outside of [BEG END)." |
| 264 | (let ((pairs (tildify--pick-alist-entry tildify-ignored-environments-alist))) | 264 | (let ((pairs (with-suppressed-warnings ((obsolete tildify--pick-alist-entry)) |
| 265 | (tildify--pick-alist-entry | ||
| 266 | tildify-ignored-environments-alist)))) | ||
| 265 | (if pairs | 267 | (if pairs |
| 266 | (tildify-foreach-ignore-environments pairs callback beg end) | 268 | (tildify-foreach-ignore-environments pairs callback beg end) |
| 267 | (funcall callback beg end)))) | 269 | (funcall callback beg end)))) |
| @@ -355,7 +357,9 @@ replacements done and response is one of symbols: t (all right), nil | |||
| 355 | (goto-char beg) | 357 | (goto-char beg) |
| 356 | (let ((regexp tildify-pattern) | 358 | (let ((regexp tildify-pattern) |
| 357 | (match-number 1) | 359 | (match-number 1) |
| 358 | (tilde (or (tildify--pick-alist-entry tildify-string-alist) | 360 | (tilde (or (with-suppressed-warnings ((obsolete |
| 361 | tildify--pick-alist-entry)) | ||
| 362 | (tildify--pick-alist-entry tildify-string-alist)) | ||
| 359 | tildify-space-string)) | 363 | tildify-space-string)) |
| 360 | (end-marker (copy-marker end)) | 364 | (end-marker (copy-marker end)) |
| 361 | answer | 365 | answer |
| @@ -365,7 +369,9 @@ replacements done and response is one of symbols: t (all right), nil | |||
| 365 | (message-log-max nil) | 369 | (message-log-max nil) |
| 366 | (count 0)) | 370 | (count 0)) |
| 367 | ;; For the time being, tildify-pattern-alist overwrites tildify-pattern | 371 | ;; For the time being, tildify-pattern-alist overwrites tildify-pattern |
| 368 | (let ((alist (tildify--pick-alist-entry tildify-pattern-alist))) | 372 | (let ((alist (with-suppressed-warnings ((obsolete |
| 373 | tildify--pick-alist-entry)) | ||
| 374 | (tildify--pick-alist-entry tildify-pattern-alist)))) | ||
| 369 | (when alist | 375 | (when alist |
| 370 | (setq regexp (car alist) match-number (cadr alist)))) | 376 | (setq regexp (car alist) match-number (cadr alist)))) |
| 371 | (while (and (not quit) | 377 | (while (and (not quit) |
| @@ -491,7 +497,9 @@ representation for current major mode, the `tildify-space-string' buffer-local | |||
| 491 | variable will be set to the representation." | 497 | variable will be set to the representation." |
| 492 | nil " ~" nil | 498 | nil " ~" nil |
| 493 | (when tildify-mode | 499 | (when tildify-mode |
| 494 | (let ((space (tildify--pick-alist-entry tildify-string-alist))) | 500 | (let ((space (with-suppressed-warnings ((obsolete |
| 501 | tildify--pick-alist-entry)) | ||
| 502 | (tildify--pick-alist-entry tildify-string-alist)))) | ||
| 495 | (if (not (string-equal " " (or space tildify-space-string))) | 503 | (if (not (string-equal " " (or space tildify-space-string))) |
| 496 | (when space | 504 | (when space |
| 497 | (setq tildify-space-string space)) | 505 | (setq tildify-space-string space)) |