Fix overflow of line in page-break-lines-mode when using line number

This is picked up from

fd3b7e38ad/page-break-lines.el

core/libs/page-break-lines.el

@@ -1,11 +1,11 @@
-;;; page-break-lines.el --- Display ugly ^L page breaks as tidy horizontal lines
+;;; page-break-lines.el --- Display ^L page breaks as tidy horizontal lines
 
 ;; Copyright (C) 2012-2015 Steve Purcell
 
 ;; Author: Steve Purcell <steve@sanityinc.com>
 ;; URL: https://github.com/purcell/page-break-lines
-;; Package-Version: 20160109.1813
-;; Package-X-Original-Version: DEV
+;; Package-Version: 0
+;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: convenience, faces
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
 
 ;; If `page-break-lines-char' is displayed at a different width to
 ;; regular characters, the rule may be either too short or too long:
-;; rules may then wrap if `truncate-lines' is nil. On some systems,
+;; rules may then wrap if `truncate-lines' is nil.  On some systems,
 ;; Emacs may erroneously choose a different font for the page break
 ;; symbol, which choice can be overridden using code such as:
 
@@ -63,22 +63,26 @@
   :prefix "page-break-lines-"
   :group 'faces)
 
+;;;###autoload
 (defcustom page-break-lines-char ?─
   "Character used to render page break lines."
   :type 'character
   :group 'page-break-lines)
 
+;;;###autoload
 (defcustom page-break-lines-lighter " PgLn"
   "Mode-line indicator for `page-break-lines-mode'."
   :type '(choice (const :tag "No lighter" "") string)
   :group 'page-break-lines)
 
+;;;###autoload
 (defcustom page-break-lines-modes
   '(emacs-lisp-mode lisp-mode scheme-mode compilation-mode outline-mode help-mode)
   "Modes in which to enable `page-break-lines-mode'."
   :type '(repeat symbol)
   :group 'page-break-lines)
 
+;;;###autoload
 (defface page-break-lines
   '((t :inherit font-lock-comment-face :bold nil :italic nil))
   "Face used to colorize page break lines.
@@ -100,18 +104,12 @@ horizontal line of `page-break-string-char' characters."
   (page-break-lines--update-display-tables))
 
 ;;;###autoload
-(defun turn-on-page-break-lines-mode ()
-  "Enable `page-break-lines-mode' in this buffer."
-  (page-break-lines-mode 1))
-
-;;;###autoload
-(defun turn-off-page-break-lines-mode ()
-  "Disable `page-break-lines-mode' in this buffer."
-  (page-break-lines-mode -1))
-
+(define-obsolete-function-alias 'turn-on-page-break-lines-mode 'page-break-lines-mode)
 
 (dolist (hook '(window-configuration-change-hook
-                after-setting-font-hook))
+                window-size-change-functions
+                after-setting-font-hook
+                display-line-numbers-mode-hook))
   (add-hook hook 'page-break-lines--update-display-tables))
 
 
@@ -121,21 +119,32 @@ horizontal line of `page-break-string-char' characters."
 If the buffer inside WINDOW has `page-break-lines-mode' enabled,
 its display table will be modified as necessary."
   (with-current-buffer (window-buffer window)
-    (if page-break-lines-mode
-        (progn
-          (unless buffer-display-table
-            (setq buffer-display-table (make-display-table)))
-          (let* ((width (- (window-width window) 1))
-                 (glyph (make-glyph-code page-break-lines-char 'page-break-lines))
-                 (new-display-entry (vconcat (make-list width glyph))))
-            (unless (equal new-display-entry (elt buffer-display-table ?\^L))
-              (aset buffer-display-table ?\^L new-display-entry))))
-      (when buffer-display-table
-        (aset buffer-display-table ?\^L nil)))))
+    (with-selected-window window
+      (if page-break-lines-mode
+          (progn
+            (unless buffer-display-table
+              (setq buffer-display-table (make-display-table)))
+            (let ((default-height (face-attribute 'default :height nil 'default)))
+              (set-face-attribute 'page-break-lines nil :height default-height)
+              (let* ((cwidth (char-width page-break-lines-char))
+                     (wwidth-pix (- (window-width nil t)
+                                    (if (bound-and-true-p display-line-numbers)
+                                        (line-number-display-width t)
+                                      0)))
+                     (width (- (/ wwidth-pix (frame-char-width) cwidth)
+                               (if (display-graphic-p) 0 1)))
+                     (glyph (make-glyph-code page-break-lines-char 'page-break-lines))
+                     (new-display-entry (vconcat (make-list width glyph))))
+                (unless (equal new-display-entry (elt buffer-display-table ?\^L))
+                  (aset buffer-display-table ?\^L new-display-entry)))))
+        (when (and (member major-mode page-break-lines-modes)
+                   buffer-display-table)
+          (aset buffer-display-table ?\^L nil))))))
 
-(defun page-break-lines--update-display-tables  ()
-  "Function called for updating display table."
-  (mapc 'page-break-lines--update-display-table (window-list nil 'no-minibuffer)))
+(defun page-break-lines--update-display-tables  (&optional frame)
+  "Function called for updating display table in windows of FRAME."
+  (unless (minibufferp)
+    (mapc 'page-break-lines--update-display-table (window-list frame 'no-minibuffer))))
 
 
 
@@ -151,6 +160,7 @@ When `major-mode' is listed in `page-break-lines-modes', then
 ;;;###autoload
 (define-global-minor-mode global-page-break-lines-mode
   page-break-lines-mode page-break-lines-mode-maybe
+  :require 'page-break-lines
   :group 'page-break-lines)
 
 
@@ -158,7 +168,6 @@ When `major-mode' is listed in `page-break-lines-modes', then
 
 ;; Local Variables:
 ;; coding: utf-8
-;; byte-compile-warnings: (not cl-functions)
 ;; checkdoc-minor-mode: t
 ;; End: