1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/display-fill-column-indicator.el b/lisp/display-fill-column-indicator.el
index 7c1df531df1..f6b7352c21b 100644
--- a/lisp/display-fill-column-indicator.el
+++ b/lisp/display-fill-column-indicator.el
@@ -24,10 +24,9 @@
 
 ;; Provides a minor mode interface for `display-fill-column-indicator'.
 ;;
-;; Toggle display of line numbers with M-x
-;; display-fill-column-indicator-mode.  To enable line numbering in
-;; all buffers, use M-x global-display-fill-column-indicator-mode.  To
-;; change the default line column
+;; Toggle display of the column indicator with M-x
+;; display-fill-column-indicator-mode.  To enable the indicator in
+;; all buffers, use M-x global-display-fill-column-indicator-mode.
 
 
 ;; NOTE: Customization variables for
@@ -38,7 +37,7 @@
 ;;; Code:
 
 (defgroup display-fill-column-indicator nil
-  "Display line numbers in the buffer."
+  "Display a fill column indicator in th buffer."
   :group 'convenience
   :group 'display)
 
@@ -48,15 +47,18 @@
   "Toggle display fill column indicator.
 This uses `display-fill-column-indicator' internally.
 
-To change the position of the line displayed by default,
+To change the position of the column displayed by default,
 customize `display-fill-column-indicator-column' you can change the
-character for the line setting `display-fill-column-indicator-character'."
+character for the indicator setting `display-fill-column-indicator-character'."
   :lighter nil
   (if display-fill-column-indicator-mode
       (progn
         (setq display-fill-column-indicator t)
         (unless display-fill-column-indicator-character
-          (if (char-displayable-p ?\u2502)
+          (if (and (char-displayable-p ?\u2502)
+                   (or (not (display-graphic-p))
+                       (eq (aref (query-font (car (internal-char-font nil ?\u2502))) 0)
+                           (face-font 'default))))
               (setq display-fill-column-indicator-character ?\u2502)
             (setq display-fill-column-indicator-character ?|))))
     (setq display-fill-column-indicator nil)))