Merge from origin/emacs-24

[gnu-emacs] / src / indent.c

diff --git a/src/indent.c b/src/indent.c
index cadafcf2c301045d5086e753f4a057a8c460430b..8660400e1cec8775f416098e7b848bd4aa442206 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -439,7 +439,7 @@ current_column (void)
            /* With a display table entry, C is displayed as is, and
               not displayed as \NNN or as ^N.  If C is a single-byte
               character, it takes one column.  If C is multi-byte in
-              an unibyte buffer, it's translated to unibyte, so it
+              a unibyte buffer, it's translated to unibyte, so it
               also takes one column.  */
            ++col;
          else
@@ -920,7 +920,7 @@ position_indentation (ptrdiff_t pos_byte)
          column += tab_width - column % tab_width;
          break;
        default:
-         if (ASCII_BYTE_P (p[-1])
+         if (ASCII_CHAR_P (p[-1])
              || NILP (BVAR (current_buffer, enable_multibyte_characters)))
            return column;
          {