diff options
| author | Glenn Morris | 2013-02-12 20:31:09 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-02-12 20:31:09 -0800 |
| commit | 01fcc3a532872b29784a4d888ab9cc1aef0eed01 (patch) | |
| tree | e1fba1dfe3ec5b61ddc3e5e3824e4536b2c39429 /src/indent.c | |
| parent | d0009c7351874e853c63ce67cea6103f33afa60b (diff) | |
| parent | 1a359750bbac95fd6bf8fe1233e747a1d26f0082 (diff) | |
| download | emacs-01fcc3a532872b29784a4d888ab9cc1aef0eed01.tar.gz emacs-01fcc3a532872b29784a4d888ab9cc1aef0eed01.zip | |
Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/indent.c b/src/indent.c index 44ecbbc8a58..ce1639eae1e 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -291,7 +291,7 @@ DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0, | |||
| 291 | doc: /* Return the horizontal position of point. Beginning of line is column 0. | 291 | doc: /* Return the horizontal position of point. Beginning of line is column 0. |
| 292 | This is calculated by adding together the widths of all the displayed | 292 | This is calculated by adding together the widths of all the displayed |
| 293 | representations of the character between the start of the previous line | 293 | representations of the character between the start of the previous line |
| 294 | and point (eg. control characters will have a width of 2 or 4, tabs | 294 | and point (e.g., control characters will have a width of 2 or 4, tabs |
| 295 | will have a variable width). | 295 | will have a variable width). |
| 296 | Ignores finite width of frame, which means that this function may return | 296 | Ignores finite width of frame, which means that this function may return |
| 297 | values greater than (frame-width). | 297 | values greater than (frame-width). |