diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-09-21 10:24:25 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-09-21 10:25:06 +0200 |
| commit | 9b14e312f409216dab647f839724d5df029e8195 (patch) | |
| tree | ceaeb58d5d284cb4fb24ee62cca3f0881f1e1b60 /lisp/progmodes/hideif.el | |
| parent | 43c0ebd8bcdd33e534b514d87ea843e93b11b89d (diff) | |
| parent | 478b786d5aa74fbb6476b51f0dea4e9ccf1f211b (diff) | |
| download | emacs-9b14e312f409216dab647f839724d5df029e8195.tar.gz | |
Merge from origin/emacs-28
478b786d5a ; * doc/lispref/windows.texi (Window Hooks): Fix a typo (b...
5085351645 * lisp/text-modes/tex-mode.el (tex-mode): Fix AUCTeX regre...
ee6f8598ca Add vc-annotate-switches to manual
616dcf27e5 ; Fix typos in Lisp symbols
5405852541 Remove mention of non-existent `annotate-switches'
191505b8a3 Mention that src/macuvs.h sometimes needs committing
10373c4b68 ; More comment fixes in font.h (bug#57935)
c2595b8dcc ; * src/font.h (struct font_driver): Comment fix.
97b928ce09 MacOS ld warning from native compilation (bug#57849)
Diffstat (limited to 'lisp/progmodes/hideif.el')
| -rw-r--r-- | lisp/progmodes/hideif.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 53788949ea4..767216c03f2 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -405,7 +405,7 @@ overlays created." ;; hidden with `hide-ifdef-lines' equals to nil while another part with 't, ;; this case happens. ;; TODO: Should we merge? or just create a container overlay? -- this can - ;; prevent `hideif-show-ifdef' expanding too many hidden contents since there + ;; prevent `show-ifdefs' expanding too many hidden contents since there ;; is only a big overlay exists there without any smaller overlays. (save-restriction (widen) ; Otherwise `point-min' and `point-max' will be restricted and thus @@ -725,7 +725,7 @@ Assuming we've just regexp-matched with `hif-decfloat-regexp' and it matched. if REMATCH is t, do a rematch." ;; In elisp `(string-to-number "01.e2")' will return 1 instead of the expected ;; 100.0; therefore we need to write our own. - ;; This function relies on the regexp groups of `hif-dexfloat-regexp' + ;; This function relies on the regexp groups of `hif-hexfloat-regexp' (if (or fix exp) (setq fix (hif-delete-char-in-string ?' fix) exp (hif-delete-char-in-string ?' exp)) |