diff options
| -rw-r--r-- | doc/emacs/indent.texi | 6 | ||||
| -rw-r--r-- | lisp/progmodes/xref.el | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 5f40acba151..654c64a7b2f 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi | |||
| @@ -110,9 +110,9 @@ parentheses, or if the junction follows another newline. | |||
| 110 | If there is a fill prefix, @kbd{M-^} deletes the fill prefix if it | 110 | If there is a fill prefix, @kbd{M-^} deletes the fill prefix if it |
| 111 | appears after the newline that is deleted. @xref{Fill Prefix}. | 111 | appears after the newline that is deleted. @xref{Fill Prefix}. |
| 112 | 112 | ||
| 113 | With a prefix argument, join the current line line to the following | 113 | With a prefix argument, join the current line to the following line. |
| 114 | line. If the region is active, and no prefix argument is given, join | 114 | If the region is active, and no prefix argument is given, join all |
| 115 | all lines in the region instead. | 115 | lines in the region instead. |
| 116 | 116 | ||
| 117 | @item C-M-\ | 117 | @item C-M-\ |
| 118 | @kindex C-M-\ | 118 | @kindex C-M-\ |
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 57d803894c8..ae35766ecdc 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el | |||
| @@ -957,7 +957,7 @@ Accepts the same arguments as `xref-show-xrefs-function'." | |||
| 957 | nil nil nil | 957 | nil nil nil |
| 958 | 'xref--read-identifier-history def))) | 958 | 'xref--read-identifier-history def))) |
| 959 | (if (equal id "") | 959 | (if (equal id "") |
| 960 | (or def (user-error "There is no defailt identifier")) | 960 | (or def (user-error "There is no default identifier")) |
| 961 | id))) | 961 | id))) |
| 962 | (t def)))) | 962 | (t def)))) |
| 963 | 963 | ||